-6.0.2 merge

This commit is contained in:
James Newton-King
2014-04-03 15:05:18 +13:00
39 changed files with 1127 additions and 171 deletions
@@ -90,6 +90,6 @@ using System.Security;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("4.5.0.0")]
[assembly: AssemblyFileVersion("6.0.1.16816")]
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.1.17203")]
[assembly: CLSCompliant(true)]