Author: kostat
Date: 2005-11-27 07:07:21 -0500 (Sun, 27 Nov 2005)
New Revision: 53524
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Data/ChangeLog
branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.vmwcsproj
Log:
merge -r 53522:53523
Modified: branches/mainsoft/gh1.7/mcs/class/System.Data/ChangeLog
===================================================================
--- branches/mainsoft/gh1.7/mcs/class/System.Data/ChangeLog 2005-11-27
09:09:03 UTC (rev 53523)
+++ branches/mainsoft/gh1.7/mcs/class/System.Data/ChangeLog 2005-11-27
12:07:21 UTC (rev 53524)
@@ -1,3 +1,7 @@
+2005-11-27 Konstantin Triger <[EMAIL PROTECTED]>
+
+ * System.Data.vmwcsproj: added ConflictOption.cs
+
2005-11-21 Senganal T <[EMAIL PROTECTED]>
* System.Data.dll.sources:
Modified: branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.vmwcsproj
===================================================================
--- branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.vmwcsproj
2005-11-27 09:09:03 UTC (rev 53523)
+++ branches/mainsoft/gh1.7/mcs/class/System.Data/System.Data.vmwcsproj
2005-11-27 12:07:21 UTC (rev 53524)
@@ -39,6 +39,7 @@
<File
RelPath="System.Data\ColumnTypeConverter.cs" SubType="Code"
BuildAction="Compile"/>
<File RelPath="System.Data\CommandBehavior.cs"
SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Data\CommandType.cs"
SubType="Code" BuildAction="Compile"/>
+ <File RelPath="System.Data\ConflictOption.cs"
BuildAction="Compile"/>
<File RelPath="System.Data\ConflictOptions.cs"
SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Data\ConnectionState.cs"
SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Data\Constraint.cs"
SubType="Code" BuildAction="Compile"/>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
