Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-11-15 00:43:26 +00:00
73 changed files with 1470 additions and 409 deletions

View File

@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly : AssemblyVersion("0.6.5.*")]
[assembly : AssemblyVersion("0.7.5.*")]
[assembly : AssemblyFileVersion("0.6.5.0")]