From aecc5f3315b9163fe7cd740ec7744e5764d65965 Mon Sep 17 00:00:00 2001 From: George Pantazis Date: Mon, 30 Apr 2012 20:22:26 +0300 Subject: [PATCH 1/1] Manually edited Version Changelog Signed-off-by: George Pantazis --- trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs | 6 ------ trunk/Pithos.Installer/rnotes.0.7.20430.html | 12 ++++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 trunk/Pithos.Installer/rnotes.0.7.20430.html diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs index b6e5f90..826915d 100644 --- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs +++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs @@ -92,12 +92,6 @@ using System.Windows; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -<<<<<<< HEAD -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.7.20427.0")] -[assembly: AssemblyFileVersionAttribute("0.7.20427.0")] -======= // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.7.20430.0")] [assembly: AssemblyFileVersionAttribute("0.7.20430.0")] ->>>>>>> 1865ad904d16c957b461d4f539cd762dfaf29dae diff --git a/trunk/Pithos.Installer/rnotes.0.7.20430.html b/trunk/Pithos.Installer/rnotes.0.7.20430.html new file mode 100644 index 0000000..af1396f --- /dev/null +++ b/trunk/Pithos.Installer/rnotes.0.7.20430.html @@ -0,0 +1,12 @@ + + +

Pithos MS Client v. 0.7.20430

+Release Date: Apr 24, 2012, 03:00 +
+Includes: +
+

Fixes to Selective Sync

+ + \ No newline at end of file -- 1.7.10.4