Update of /cvsroot/monetdb/sql/NT/MonetDB5-SQL
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27933/NT/MonetDB5-SQL

Modified Files:
        MonetDB5-SQL-Installer.vdproj 
Log Message:
propagated changes of Thursday Aug 07 2008
from the SQL_2-24 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/08/07 - sjoerd: NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,1.19.2.10
We have switched to a newer iconv library.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: MonetDB5-SQL-Installer.vdproj
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- MonetDB5-SQL-Installer.vdproj       24 Jun 2008 07:59:44 -0000      1.26
+++ MonetDB5-SQL-Installer.vdproj       7 Aug 2008 14:18:03 -0000       1.27
@@ -273,6 +273,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_2C7B5DF9CBE642149692C67FC052ECA4"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_2CA3CB676BC341B29AC6DDECF9B3AEBB"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -447,12 +453,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_51E1B299A2124525B995986733261DE7"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_52DCEC5806254D3F9246489B9C5DFC27"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -531,12 +531,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_657924CD899948DE8D62CB30D88A895E"
-        "OwnerKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_6666641E40E64B529FF9A494AEF9F054"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1143,6 +1137,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_DDBCD0AB20D14B608B1F5FEB9B959F87"
+        "OwnerKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_DDCE0C717781450C88530B4233416C81"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -2239,6 +2239,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2C7B5DF9CBE642149692C67FC052ECA4"
+            {
+            "SourcePath" = "8:C:\\iconv-1.11.win32\\bin\\iconv.dll"
+            "TargetName" = "8:iconv.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+            "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}:_2CA3CB676BC341B29AC6DDECF9B3AEBB"
             {
             "SourcePath" = "8:website.html"
@@ -2819,26 +2839,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_51E1B299A2124525B995986733261DE7"
-            {
-            "SourcePath" = "8:C:\\iconv-1.9.2.win32\\bin\\iconv.dll"
-            "TargetName" = "8:iconv.dll"
-            "Tag" = "8:"
-            "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
-            "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}:_52DCEC5806254D3F9246489B9C5DFC27"
             {
             "SourcePath" = "8:C:\\Program Files\\PCRE\\bin\\pcre.dll"
@@ -6514,11 +6514,11 @@
         }
         "MergeModule"
         {
-            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_657924CD899948DE8D62CB30D88A895E"
+            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_819BD8650A494CC68BD064E23EF621BB"
             {
             "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge 
Modules\\Microsoft_VC80_CRT_x86.msm"
                 "Properties"
                 {
                 }
@@ -6528,11 +6528,11 @@
             "Feature" = "8:"
             "IsolateTo" = "8:"
             }
-            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_819BD8650A494CC68BD064E23EF621BB"
+            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DDBCD0AB20D14B608B1F5FEB9B959F87"
             {
             "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:FALSE"
-            "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge 
Modules\\Microsoft_VC80_CRT_x86.msm"
+            "IsDependency" = "11:TRUE"
+            "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm"
                 "Properties"
                 {
                 }


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to