merge commit

This commit is contained in:
robvde 2012-09-10 19:42:03 +04:00
commit 2f569ccd05
15 changed files with 511 additions and 147 deletions

View file

@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Outercurve Foundation")]
[assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")]
[assembly: AssemblyVersion("1.2.2.1")]
[assembly: AssemblyFileVersion("1.2.2.1")]
[assembly: AssemblyInformationalVersion("1.2.2.1")]
[assembly: AssemblyVersion("2.0.0.1")]
[assembly: AssemblyFileVersion("2.0.0.1")]
[assembly: AssemblyInformationalVersion("2.0.0")]

View file

@ -18,7 +18,7 @@ Imports System.Runtime.CompilerServices
Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Outercurve Foundation"), _
Assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation."), _
Assembly: AssemblyVersion("1.2.2.1"), _
Assembly: AssemblyFileVersion("1.2.2.1"), _
Assembly: AssemblyInformationalVersion("1.2.2.1")>
Assembly: AssemblyVersion("2.0.0.1"), _
Assembly: AssemblyFileVersion("2.0.0.1"), _
Assembly: AssemblyInformationalVersion("2.0.0")>