merged RC_1_1 int master

2019-01-12 16:02:46 +01:00 · 2019-01-12 16:02:46 +01:00 · 3a1e546a6c
parent 8b067310b1 434272519f
commit 3a1e546a6c
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@ -94,6 +94,8 @@
 	* resume data no longer has timestamps of files
 	* require C++11 to build libtorrent

+1.1.12 release
+
 	* uTP performance fixes

 1.1.11 release