projects / pithos-ms-client / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d808362)
Manually edited Version
authorGeorge Pantazis <gpant@noc.grnet.gr>
Mon, 30 Apr 2012 17:22:26 +0000 (20:22 +0300)
committerGeorge Pantazis <gpant@noc.grnet.gr>
Mon, 30 Apr 2012 17:22:26 +0000 (20:22 +0300)
Changelog

Signed-off-by: George Pantazis <gpant@noc.grnet.gr>

trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs patch | blob | history
trunk/Pithos.Installer/rnotes.0.7.20430.html [new file with mode: 0644] patch | blob

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index b6e5f90..826915d 100644 (file)
--- 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 (file)
index 0000000..af1396f
--- /dev/null
+++ b/trunk/Pithos.Installer/rnotes.0.7.20430.html
@@ -0,0 +1,12 @@
+<html>
+<body>
+<h2>Pithos MS Client v. 0.7.20430</h2>
+Release Date: Apr 24, 2012, 03:00
+<br/>
+Includes:
+<br/>
+<ul>
+<li> Fixes to Selective Sync</li>
+</ul>
+</body>
+</html>
\ No newline at end of file
Unnamed repository; edit this file 'description' to name the repository.