Update of /cvsroot/monetdb/sql/NT/MonetDB5-SQL
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25842/MonetDB5-SQL
Modified Files:
MonetDB5-SQL-Installer.vdproj
Log Message:
Fix propagation conflicts properly.
Index: MonetDB5-SQL-Installer.vdproj
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- MonetDB5-SQL-Installer.vdproj 24 Feb 2010 11:25:38 -0000 1.67
+++ MonetDB5-SQL-Installer.vdproj 24 Feb 2010 12:04:10 -0000 1.68
@@ -3457,7 +3457,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-2.36.1\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-2.37.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3557,8 +3557,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6A6181D776F04BA0AD223E266AB8B39A"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-2.37.0\\dump-restore.txt"
- "TargetName" = "8:dump-restore.txt"
+ "SourcePath" = "8:Lib\\MonetDB5\\lib_groupby.dll"
+ "TargetName" = "8:lib_groupby.dll"
"Tag" = "8:"
"Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
"Condition" = "8:"
@@ -4717,8 +4717,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9D0C7CC7DBE342A6901EBE1DF0252793"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-2.37.0\\dump-restore.html"
- "TargetName" = "8:dump-restore.html"
+ "SourcePath" = "8:Lib\\MonetDB5\\opt_multiplex.mal"
+ "TargetName" = "8:opt_multiplex.mal"
"Tag" = "8:"
"Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
"Condition" = "8:"
@@ -4877,7 +4877,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "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:_6C21CE578F0941D09FDD9951A229FF37"
------------------------------------------------------------------------------
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
