git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@564...

diff --git a/server setup/Server Setup.vdproj b/server setup/Server Setup.vdproj
index be1fa51cb1d4c7fcee1188c027019b02c395d99d..29d1eb9dee28e6ec5e91fea654f83381a75ed5d9 100644 (file)
--- a/server setup/Server Setup.vdproj
+++ b/server setup/Server Setup.vdproj
@@ -21,7 +21,7 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_0BE0C4CBA17C48458EA6BF38345D8A15"\r
+        "MsmKey" = "8:_20DA37DF7AD14DF2A4BA1226E79A17EE"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
@@ -63,6 +63,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_9BDB7A0597414462B85BC2D38BB0EC74"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_A118DDFF73AB43268E98916A78D0B35E"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -251,7 +257,7 @@
                 {\r
                 "Name" = "8:.NET Framework"\r
                 "Message" = "8:[VSDNETMSG]"\r
-                "FrameworkVersion" = "8:3.5.30729    "\r
+                "FrameworkVersion" = "8:3.5.30729     "\r
                 "AllowLaterVersions" = "11:FALSE"\r
                 "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=76617"\r
                 }\r
@@ -279,26 +285,6 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0BE0C4CBA17C48458EA6BF38345D8A15"\r
-            {\r
-            "SourcePath" = "8:..\\ChangeLog.txt"\r
-            "TargetName" = "8:ChangeLog.txt"\r
-            "Tag" = "8:"\r
-            "Folder" = "8:_9375E488732B409C8187CC9603423443"\r
-            "Condition" = "8:"\r
-            "Transitive" = "11:FALSE"\r
-            "Vital" = "11:TRUE"\r
-            "ReadOnly" = "11:FALSE"\r
-            "Hidden" = "11:FALSE"\r
-            "System" = "11:FALSE"\r
-            "Permanent" = "11:FALSE"\r
-            "SharedLegacy" = "11:FALSE"\r
-            "PackageAs" = "3:1"\r
-            "Register" = "3:1"\r
-            "Exclude" = "11:FALSE"\r
-            "IsDependency" = "11:FALSE"\r
-            "IsolateTo" = "8:"\r
-            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_23FBE71C96454A12ABF2B9A089D19654"\r
             {\r
             "SourcePath" = "8:..\\..\\dependencies\\ffmpeg 0.5\\lib\\avcodec-51.dll"\r
@@ -612,7 +598,7 @@
         "Name" = "8:Microsoft Visual Studio"\r
         "ProductName" = "8:CasparCG Server 1.8.2"\r
         "ProductCode" = "8:{31AAE628-5F8B-4311-B733-4099CEEBC0B3}"\r
-        "PackageCode" = "8:{71279E03-98AB-4937-BE27-6880C535D4EB}"\r
+        "PackageCode" = "8:{09DDCC04-FFA6-43AB-8475-6205F5CBD3CB}"\r
         "UpgradeCode" = "8:{E02D764D-FA5E-4AE2-BF0C-D9B632065D1E}"\r
         "AspNetVersion" = "8:4.0.30319.0"\r
         "RestartWWWService" = "11:FALSE"\r
@@ -1544,6 +1530,34 @@
         }\r
         "MergeModule"\r
         {\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_20DA37DF7AD14DF2A4BA1226E79A17EE"\r
+            {\r
+            "UseDynamicProperties" = "11:TRUE"\r
+            "IsDependency" = "11:FALSE"\r
+            "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge Modules\\Microsoft_VC100_CRT_x86.msm"\r
+                "Properties"\r
+                {\r
+                }\r
+            "LanguageId" = "3:0"\r
+            "Exclude" = "11:FALSE"\r
+            "Folder" = "8:"\r
+            "Feature" = "8:"\r
+            "IsolateTo" = "8:"\r
+            }\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_9BDB7A0597414462B85BC2D38BB0EC74"\r
+            {\r
+            "UseDynamicProperties" = "11:TRUE"\r
+            "IsDependency" = "11:FALSE"\r
+            "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge Modules\\Microsoft_VC100_ATL_x86.msm"\r
+                "Properties"\r
+                {\r
+                }\r
+            "LanguageId" = "3:0"\r
+            "Exclude" = "11:FALSE"\r
+            "Folder" = "8:"\r
+            "Feature" = "8:"\r
+            "IsolateTo" = "8:"\r
+            }\r
         }\r
         "ProjectOutput"\r
         {\r