Browse Source

Merge branch 'release/1.0.11' into develop

Antony Male 10 years ago
parent
commit
c01d4bb3f8
2 changed files with 7 additions and 2 deletions
  1. 5 0
      CHANGELOG.txt
  2. 2 2
      src/SyncTrayzor/Properties/AssemblyInfo.cs

+ 5 - 0
CHANGELOG.txt

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+v1.0.11
+-------
+
+ - Fix bug where GUI would freeze if Syncthing logged to console too frequently (#36)
+
 v1.0.10
 -------
 

+ 2 - 2
src/SyncTrayzor/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.10.0")]
-[assembly: AssemblyFileVersion("1.0.10.0")]
+[assembly: AssemblyVersion("1.0.11.0")]
+[assembly: AssemblyFileVersion("1.0.11.0")]