List:Commits« Previous MessageNext Message »
From:Julio Casal Date:June 20 2011 1:55pm
Subject:bzr commit into connector-net-6.2 branch (julio.casal:952)
View as plain text  
#At file:///D:/Users/jcasalt/Dev/connector-net/6.2/ based on revid:julio.casal@strippednklx4bl

  952 Julio Casal	2011-06-20 [merge]
      Merged.

    modified:
      MySql.Data/Provider/MySql.Data.CF.csproj
=== modified file 'MySql.Data/Provider/MySql.Data.CF.csproj'
--- a/MySql.Data/Provider/MySql.Data.CF.csproj	2011-05-10 21:02:00 +0000
+++ b/MySql.Data/Provider/MySql.Data.CF.csproj	2011-06-20 13:55:42 +0000
@@ -157,6 +157,9 @@ <Project DefaultTargets="Build" xmlns
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\ReservedWords.txt" />
+  </ItemGroup>
   <Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
   <Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>

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.2 branch (julio.casal:952) Julio Casal20 Jun