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

@@ -29,7 +29,7 @@ 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("1.0.0.0")]
[assembly: AssemblyVersion("0.7.5.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the