Merge: dev to default

This commit is contained in:
ptsurbeleu 2012-08-01 07:34:56 -07:00
commit 19d6bae05e
1884 changed files with 65140 additions and 30708 deletions

View file

@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
' Runtime Version:4.0.30319.261
' Runtime Version:4.0.30319.269
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@ -17,7 +17,7 @@ Imports System.Runtime.CompilerServices
Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Outercurve Foundation"), _
Assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation."), _
Assembly: AssemblyVersion("1.2.1.0"), _
Assembly: AssemblyFileVersion("1.2.1.6"), _
Assembly: AssemblyInformationalVersion("1.2.1")>
Assembly: AssemblyVersion("1.2.2.0"), _
Assembly: AssemblyFileVersion("1.2.2.0"), _
Assembly: AssemblyInformationalVersion("1.2.2")>