projects
/
pithos-ms-client
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version
[pithos-ms-client]
/
trunk
/
Pithos.Client.WPF
/
Properties
/
AssemblyInfo.cs
diff --git
a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index
a040480
..
df860af
100644
(file)
--- a/
trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/
trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@
-56,7
+56,7
@@
using System.Windows;
[assembly: AssemblyCopyright("Copyright © GRNet 2011-2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyCopyright("Copyright © GRNet 2011-2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersion("2012-04-24")]
+[assembly: AssemblyInformationalVersion("2012-05-22")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@
-92,9
+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:
//
// 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("1.0.*")]
-=======
->>>>>>> 2b0ec5b83deb6c61ffae7943da4606733b0f5e76
-[assembly: AssemblyVersion("0.7.20430.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.20430.0")]
+[assembly: AssemblyVersion("0.7.20607.0")]
+[assembly: AssemblyFileVersionAttribute("0.7.20607.0")]