projects / pithos-ms-client / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 2b0ec5b)
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client
authorGeorge Pantazis <gpant@noc.grnet.gr>
Mon, 30 Apr 2012 17:23:28 +0000 (20:23 +0300)
committerGeorge Pantazis <gpant@noc.grnet.gr>
Mon, 30 Apr 2012 17:23:28 +0000 (20:23 +0300)
Conflicts:
trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs

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 4b15f49..a040480 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -92,5 +92,9 @@ 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.*")]
+=======
+>>>>>>> 2b0ec5b83deb6c61ffae7943da4606733b0f5e76
 [assembly: AssemblyVersion("0.7.20430.0")]
 [assembly: AssemblyFileVersionAttribute("0.7.20430.0")]
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.