Changeset: e35bf57e40f3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e35bf57e40f3
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (246 lines):
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -111,12 +111,6 @@
}
"Entry"
{
- "MsmKey" = "8:_1BC0095AF28F4FA89B8C63C9A1E6E4CA"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_1EB34EF8EFB84BAF952F92AD02EEB00C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -687,12 +681,6 @@
}
"Entry"
{
- "MsmKey" = "8:_AE686CBAB379451B9E7E836DFC1E2E8B"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_B04121FE9B884D19BE4D330CA83E9ED8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -861,12 +849,6 @@
}
"Entry"
{
- "MsmKey" = "8:_DE24FFC57F274EE2B69A2727A960003E"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_E0896DBB80744539988DDE841F630AAE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1388,26 +1370,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1BC0095AF28F4FA89B8C63C9A1E6E4CA"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_rapi.dll"
- "TargetName" = "8:lib_rapi.dll"
- "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}:_1EB34EF8EFB84BAF952F92AD02EEB00C"
{
"SourcePath" = "8:lib\\monetdb5\\clients.mal"
@@ -3288,26 +3250,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AE686CBAB379451B9E7E836DFC1E2E8B"
- {
- "SourcePath" = "8:lib\\monetdb5\\autoload\\50_rapi.mal"
- "TargetName" = "8:50_rapi.mal"
- "Tag" = "8:"
- "Folder" = "8:_A4A821D237B943CFACE8D54F3F3971E3"
- "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}:_B04121FE9B884D19BE4D330CA83E9ED8"
{
"SourcePath" = "8:lib\\monetdb5\\status.mal"
@@ -3868,26 +3810,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE24FFC57F274EE2B69A2727A960003E"
- {
- "SourcePath" = "8:lib\\monetdb5\\rapi.mal"
- "TargetName" = "8:rapi.mal"
- "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}:_E0896DBB80744539988DDE841F630AAE"
{
"SourcePath" = "8:lib\\monetdb5\\identifier.mal"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -111,12 +111,6 @@
}
"Entry"
{
- "MsmKey" = "8:_1BC0095AF28F4FA89B8C63C9A1E6E4CA"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_1EB34EF8EFB84BAF952F92AD02EEB00C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -687,12 +681,6 @@
}
"Entry"
{
- "MsmKey" = "8:_AE686CBAB379451B9E7E836DFC1E2E8B"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_B04121FE9B884D19BE4D330CA83E9ED8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -861,12 +849,6 @@
}
"Entry"
{
- "MsmKey" = "8:_DE24FFC57F274EE2B69A2727A960003E"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_E0896DBB80744539988DDE841F630AAE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1388,26 +1370,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1BC0095AF28F4FA89B8C63C9A1E6E4CA"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_rapi.dll"
- "TargetName" = "8:lib_rapi.dll"
- "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}:_1EB34EF8EFB84BAF952F92AD02EEB00C"
{
"SourcePath" = "8:lib\\monetdb5\\clients.mal"
@@ -3288,26 +3250,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AE686CBAB379451B9E7E836DFC1E2E8B"
- {
- "SourcePath" = "8:lib\\monetdb5\\autoload\\50_rapi.mal"
- "TargetName" = "8:50_rapi.mal"
- "Tag" = "8:"
- "Folder" = "8:_A4A821D237B943CFACE8D54F3F3971E3"
- "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}:_B04121FE9B884D19BE4D330CA83E9ED8"
{
"SourcePath" = "8:lib\\monetdb5\\status.mal"
@@ -3868,26 +3810,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE24FFC57F274EE2B69A2727A960003E"
- {
- "SourcePath" = "8:lib\\monetdb5\\rapi.mal"
- "TargetName" = "8:rapi.mal"
- "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}:_E0896DBB80744539988DDE841F630AAE"
{
"SourcePath" = "8:lib\\monetdb5\\identifier.mal"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
