Update of /cvsroot/monetdb/sql/NT/MonetDB5-SQL64
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25842/MonetDB5-SQL64
Modified Files:
MonetDB5-SQL-Installer.vdproj
Log Message:
Fix propagation conflicts properly.
Index: MonetDB5-SQL-Installer.vdproj
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- MonetDB5-SQL-Installer.vdproj 24 Feb 2010 11:25:44 -0000 1.55
+++ MonetDB5-SQL-Installer.vdproj 24 Feb 2010 12:04:10 -0000 1.56
@@ -2549,8 +2549,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3213F9F7BF0C46CDA4B50BA6E77B9AD7"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-2.37.0\\dump-restore.html"
- "TargetName" = "8:dump-restore.html"
+ "SourcePath" = "8:Lib\\MonetDB5\\opt_strengthReduction.mal"
+ "TargetName" = "8:opt_strengthReduction.mal"
"Tag" = "8:"
"Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
"Condition" = "8:"
@@ -2669,7 +2669,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_380F5AEC34A748AF9AE41F715472D526"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-2.36.1\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-2.37.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_4A91789AB7C84241A62C790D7B406FE0"
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
