List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:June 29 2011 3:38pm
Subject:bzr commit into connector-net-6.4 branch (reggie.burnett:1016)
View as plain text  
#At file:///C:/Users/Reggie/work/connector-net/6.4/ based on revid:reggie.burnett@strippedbwrsqqew0w

 1016 Reggie Burnett	2011-06-29 [merge]
      merged

    modified:
      Source/MySql.Data.Entity/Properties/Resources.Designer.cs
      Source/MySql.VisualStudio/Properties/Resources.resx
=== modified file 'Source/MySql.Data.Entity/Properties/Resources.Designer.cs'
=== modified file 'Source/MySql.Data.Entity/Properties/Resources.Designer.cs'
--- a/Source/MySql.Data.Entity/Properties/Resources.Designer.cs	2011-06-21 18:51:27 +0000
+++ b/Source/MySql.Data.Entity/Properties/Resources.Designer.cs	2011-06-29 15:37:21 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5444
+//     Runtime Version:4.0.30319.235
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

=== modified file 'Source/MySql.VisualStudio/Properties/Resources.resx'
--- a/Source/MySql.VisualStudio/Properties/Resources.resx	2010-05-19 17:41:25 +0000
+++ b/Source/MySql.VisualStudio/Properties/Resources.resx	2011-06-29 15:37:21 +0000
@@ -511,7 +511,7 @@
     <value>The data length for the table.</value>
   </data>
   <data name="ProductDetails" xml:space="preserve">
-    <value>Data design and management tools for MySQL.  Copyright © 2007-2009 MySQL AB</value>
+    <value>Data design and management tools for MySQL.  Copyright © 2007-2011 Oracle, Inc.</value>
   </data>
   <data name="DisplayName_View_IsUpdatable" xml:space="preserve">
     <value>Is Updatable</value>

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into connector-net-6.4 branch (reggie.burnett:1016) Reggie Burnett29 Jun