Changeset: 78eba46696f1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78eba46696f1
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (24 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
@@ -1326,7 +1326,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win32\\lib\\libxml2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win32\\bin\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
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
@@ -1306,7 +1306,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win64\\lib\\libxml2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win64\\bin\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
