Update of /cvsroot/monetdb/pathfinder/NT/MonetDB4-XQuery
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8453/NT/MonetDB4-XQuery
Modified Files:
MonetDB4-XQuery-Installer.vdproj
Log Message:
propagated changes of Tuesday Dec 18 2007 - Wednesday Dec 19 2007
from the XQuery_0-20 branch to the development trunk
Please note:
There were conflicts in
NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj,
and I am not sure, whether I resolved them correctly.
Please check carefully.
In case of doubt, feel free to undo this propagation
NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj: r1.8 -> r1.9
and redo/propagate the conflicting changes
NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj: r1.2.2.9 ->
1.2.2.10
(possibly selectively/partly) by hand.
Index: MonetDB4-XQuery-Installer.vdproj
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MonetDB4-XQuery-Installer.vdproj 5 Dec 2007 09:36:57 -0000 1.8
+++ MonetDB4-XQuery-Installer.vdproj 19 Dec 2007 19:23:18 -0000 1.9
@@ -21,6 +21,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_02B85DFFF1D54D15BDA4F1ED00189513"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_039D616D2FE84FF495B8F9DCBC94DEA7"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -477,6 +483,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_90EFD87B132246A085BCFF91C48C950F"
+ "OwnerKey" = "8:_EA668A9692344C8396B4176458706382"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_92687BC340694343AEB4EB808A95FC8B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -735,6 +747,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_CD722A109A354C529C55BAF6B01333D9"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_CDF313BBB2C74DDD9AF9B5285BAD6DB9"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -837,6 +855,18 @@
}
"Entry"
{
+ "MsmKey" = "8:_E8CA6A80B80040B2958A7E3FD60A6EAE"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_E9BC27A87CCA4AA2AE5E8D8127E45B7A"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_EA668A9692344C8396B4176458706382"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1034,6 +1064,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_02B85DFFF1D54D15BDA4F1ED00189513"
+ {
+ "SourcePath" = "8:share\\MonetDB\\lib\\monetdb-1.7-jdbc.jar"
+ "TargetName" = "8:monetdb-1.7-jdbc.jar"
+ "Tag" = "8:"
+ "Folder" = "8:_2E7A7A2A3AA7443EB1803999F76D6C26"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_039D616D2FE84FF495B8F9DCBC94DEA7"
{
"SourcePath" = "8:C:\\Program
Files\\Intel\\Compiler\\C++\\9.1\\IA32\\Bin\\libmmd.dll"
@@ -3414,6 +3464,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CD722A109A354C529C55BAF6B01333D9"
+ {
+ "SourcePath" = "8:share\\MonetDB\\xrpc\\export\\xrpc.html"
+ "TargetName" = "8:xrpc.html"
+ "Tag" = "8:"
+ "Folder" = "8:_F2A6A1E84C544DFCA135E87057353285"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CDF313BBB2C74DDD9AF9B5285BAD6DB9"
{
"SourcePath" = "8:lib\\MonetDB4\\lib_uchr.dll"
@@ -3754,6 +3824,46 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E8CA6A80B80040B2958A7E3FD60A6EAE"
+ {
+ "SourcePath" = "8:share\\MonetDB\\xrpc\\export\\xrpc-mod.xq"
+ "TargetName" = "8:xrpc-mod.xq"
+ "Tag" = "8:"
+ "Folder" = "8:_F2A6A1E84C544DFCA135E87057353285"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E9BC27A87CCA4AA2AE5E8D8127E45B7A"
+ {
+ "SourcePath" = "8:lib\\MonetDB4\\upgrade.mil"
+ "TargetName" = "8:upgrade.mil"
+ "Tag" = "8:"
+ "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ECAEB856F1664BAB9BA4C5E0FC43D2C1"
{
"SourcePath" = "8:lib\\MonetDB4\\builtin.mil"
@@ -4905,7 +5015,7 @@
}
"MergeModule"
{
-
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EA668A9692344C8396B4176458706382"
+
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_90EFD87B132246A085BCFF91C48C950F"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
