Changeset: ef89f95aafc2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef89f95aafc2 Modified Files: NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj Branch: default Log Message:
Merged from Oct2012 diffs (truncated from 968 to 300 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 @@ -21,6 +21,12 @@ } "Entry" { + "MsmKey" = "8:_03E4CB5550E2405DB1D01450DAB51EB3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_0589C6F724D0421C9C909F12DA19B36A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -75,12 +81,24 @@ } "Entry" { + "MsmKey" = "8:_10584133EE8047D688FBC01F2AED6EB0" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_13440C2EDE6842BF8D9F24F554EEB87F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_1445035540B54519B1090EBEAF8B9F5C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_15E2F9C224BC494DBFDBDC5F2240C5B8" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -135,13 +153,13 @@ } "Entry" { - "MsmKey" = "8:_2267095870CB48B3954DC1293ADF4ED1" + "MsmKey" = "8:_21FB7083CF534CECA100E30891462617" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_22CF15596C3440AF97C4E4879B6501FA" + "MsmKey" = "8:_2267095870CB48B3954DC1293ADF4ED1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -153,13 +171,13 @@ } "Entry" { - "MsmKey" = "8:_27FE8217C6414AA7B9CDE51D64B064DE" + "MsmKey" = "8:_28929876B0E14579B2017751625AE460" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_28929876B0E14579B2017751625AE460" + "MsmKey" = "8:_29235355A89E4CE398E353AC8D8C5589" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -327,13 +345,13 @@ } "Entry" { - "MsmKey" = "8:_545A83546ACA472BB82F549676B4D39D" + "MsmKey" = "8:_589DE39976D34D3ABCE290B534E4C114" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_589DE39976D34D3ABCE290B534E4C114" + "MsmKey" = "8:_5BAEA981D4F9422DAF4AE4D43DAFF0FC" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -351,6 +369,12 @@ } "Entry" { + "MsmKey" = "8:_5F9503044C8F466EBEB5D924F1FE5C13" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_611BE5BF52AE42FEAC98E33662E1AA69" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -387,12 +411,6 @@ } "Entry" { - "MsmKey" = "8:_67CE00377BEF49A7B2ADA1FF18B489C2" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_68E67A85749F4F578D9176B0A534248B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -423,12 +441,6 @@ } "Entry" { - "MsmKey" = "8:_7A5DD6A9EBBA42C6A0E4ABD46BA4BC5E" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_7B3835E35ACA4987A1807A460AE4BD7E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -495,7 +507,13 @@ } "Entry" { - "MsmKey" = "8:_8EA6DC1782924AD48AB1B6E6EAB7B682" + "MsmKey" = "8:_8CF0D966057D40D8951B67F17E21F8D9" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8E4C682FF8654D7CBAC4E000B4580B36" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -519,12 +537,6 @@ } "Entry" { - "MsmKey" = "8:_941607EF907E447EAB95B0E29019D648" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_95D0997175AF4209B0FD294242E1D3C2" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -543,13 +555,13 @@ } "Entry" { - "MsmKey" = "8:_97EE891E8BF64CF0AF043FBBFFA8D3C8" + "MsmKey" = "8:_9DF44FEB778F47408CA24C054AF8F9B5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A157621BD5F446A1A21A1FF2F9DE7AA8" + "MsmKey" = "8:_A000F45BF7AF49C49840BE5B62CC33D9" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -585,7 +597,7 @@ } "Entry" { - "MsmKey" = "8:_A52FC17D301548F58568071923AB12CE" + "MsmKey" = "8:_A72836DA12364DC487997DA532824457" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -621,12 +633,6 @@ } "Entry" { - "MsmKey" = "8:_AE90D894F58844B18174610A1B667ECE" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_AEA303FD566C46F8967E6A26C9E703D3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -645,7 +651,7 @@ } "Entry" { - "MsmKey" = "8:_B2ADEB370A334007A5067AA7EFBB78C1" + "MsmKey" = "8:_B2F3BC1050334F4EBDA85AE1E7E33BF7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -663,12 +669,6 @@ } "Entry" { - "MsmKey" = "8:_BBFF69849CA2420ABD65A4AFFD0CDBCA" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_BC1C1FC22A804319853B31D079C4B80A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -699,12 +699,6 @@ } "Entry" { - "MsmKey" = "8:_C8B2F8B0D2FA4CF8864EEE5F8E54541C" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_C92FCD349BF745038AB02DE7FFB52800" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -807,12 +801,6 @@ } "Entry" { - "MsmKey" = "8:_E0AE2F4BDCFF45CBBFC86922E82454AA" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E13B077DCC48449BBB7679B67C003143" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -909,10 +897,28 @@ } "Entry" { + "MsmKey" = "8:_FBF44D32BD554068B42FE3AAB9C0191D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_FEBCE26E183F4673BFA57C6EFD59AB26" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_FEC2A3A2B0AE4D0990D6AE908F876EE4" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FF42D3A8222F4F898F9BAB48F02EBC29" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -1015,6 +1021,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03E4CB5550E2405DB1D01450DAB51EB3" + { + "SourcePath" = "8:lib\\monetdb5\\jaql.mal" + "TargetName" = "8:jaql.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}:_0589C6F724D0421C9C909F12DA19B36A" { "SourcePath" = "8:lib\\monetdb5\\calc.mal" @@ -1195,6 +1221,26 @@ "IsDependency" = "11:FALSE" _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list