Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-02-22 01:28:54 +00:00
141 changed files with 12110 additions and 779 deletions

View File

@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
// Revision
//
[assembly: AssemblyVersion("0.7.6.*")]
[assembly: AssemblyFileVersion("1.0.0.0")]