merged RC_1_1 int master

arvidn · Jan 12, 2019 · 3a1e546 · 3a1e546
2 parents 8b06731 + 4342725
commit 3a1e546
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -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