From a1169e2fcfe354ae030c42f56709d8efd0443f63 Mon Sep 17 00:00:00 2001
From: Flow86 <github@fd.mytrap.de>
Date: Mon, 17 Jan 2011 14:07:33 +0000
Subject: [PATCH] Subversion Revision 6990:

nochmals paar anpassungen fuer erfolgreichen build ...

M: /s25client/branches/s25client_0.7/win32/vs2010/s25client-setup/s25client-setup.vdproj
---
 libsiedler2                                   |  2 +-
 s-c                                           |  2 +-
 s25update                                     |  2 +-
 .../s25client-setup/s25client-setup.vdproj    | 80 -------------------
 4 files changed, 3 insertions(+), 83 deletions(-)

diff --git a/libsiedler2 b/libsiedler2
index b3551c31ee..9d7214fe26 160000
--- a/libsiedler2
+++ b/libsiedler2
@@ -1 +1 @@
-Subproject commit b3551c31ee9f4359181e37cc5d84ad2e0baa8934
+Subproject commit 9d7214fe2696bded51563073cf4598cadc2484ae
diff --git a/s-c b/s-c
index b3b3ed4fa3..66d38a6e08 160000
--- a/s-c
+++ b/s-c
@@ -1 +1 @@
-Subproject commit b3b3ed4fa3f89960024e8b3ba31a8bf1f7eae52c
+Subproject commit 66d38a6e082efabc9f9380112311619331fb9f98
diff --git a/s25update b/s25update
index e496bd8959..c1751a725d 160000
--- a/s25update
+++ b/s25update
@@ -1 +1 @@
-Subproject commit e496bd8959ec488f4a18227af9c67f785dc9658a
+Subproject commit c1751a725df08519ac99b3fbf0e17e0ce94366b3
diff --git a/win32/vs2010/s25client-setup/s25client-setup.vdproj b/win32/vs2010/s25client-setup/s25client-setup.vdproj
index e0e86ed23a..57f5cd79dc 100644
--- a/win32/vs2010/s25client-setup/s25client-setup.vdproj
+++ b/win32/vs2010/s25client-setup/s25client-setup.vdproj
@@ -561,12 +561,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_2B16E679F6BC4B549C12FC85C559ACFD"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_2B7C9E3AA8744D20BECBBE5167B2E7CF"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1341,12 +1335,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_8A86AC7F172B4280808692891D2AA7D2"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_8ACCFE9B5BB54CF98A4573A217945BBE"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1534,12 +1522,6 @@
         "Entry"
         {
         "MsmKey" = "8:_A38E104E8F544170A997E1212098B0A1"
-        "OwnerKey" = "8:_8A86AC7F172B4280808692891D2AA7D2"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_A38E104E8F544170A997E1212098B0A1"
         "OwnerKey" = "8:_4B51EBD99D3E44B7A198A1A6DEF2C3E6"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -1551,12 +1533,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_A38E104E8F544170A997E1212098B0A1"
-        "OwnerKey" = "8:_2B16E679F6BC4B549C12FC85C559ACFD"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_A42278E22F0C42E58EE635BEC070635B"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -11116,34 +11092,6 @@
                 {
                 }
             }
-            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2B16E679F6BC4B549C12FC85C559ACFD"
-            {
-            "SourcePath" = "8:..\\Release\\libsiedler2.lib"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_99A457B5CE6645C3B24358FE0EDD7B95"
-            "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:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{290E94F7-C0BE-4950-87AA-D269467A82BF}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4324DE1D49E84780BB1D5807C0193174"
             {
             "SourcePath" = "8:..\\Release\\s-c_resample.exe"
@@ -11200,34 +11148,6 @@
                 {
                 }
             }
-            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8A86AC7F172B4280808692891D2AA7D2"
-            {
-            "SourcePath" = "8:..\\Release\\libsiedler2.lib"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_1B7A32FD810F445EA615D5241410FB64"
-            "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:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{290E94F7-C0BE-4950-87AA-D269467A82BF}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8F45A904CFA64DDC8C20F621F1F60EC2"
             {
             "SourcePath" = "8:"