Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1473)

Unified Diff: remoting/host/win/remoting_core.manifest

Issue 12092117: Merged all Chromoting Host code into remoting_core.dll (Windows). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Embedd manifests regardless of the used build system. Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/win/remoting_core.manifest
diff --git a/chrome_frame/resources/npchrome_frame.dll.manifest b/remoting/host/win/remoting_core.manifest
similarity index 50%
copy from chrome_frame/resources/npchrome_frame.dll.manifest
copy to remoting/host/win/remoting_core.manifest
index 03bfc84f7de91848ae006303464ce51063b7252a..6c280a5df827df867bc12676cd3c4b1c0d7b203f 100644
--- a/chrome_frame/resources/npchrome_frame.dll.manifest
+++ b/remoting/host/win/remoting_core.manifest
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <dependency>
- <dependentAssembly>
- <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
- </dependentAssembly>
- </dependency>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+ </dependentAssembly>
+ </dependency>
</assembly>

Powered by Google App Engine
This is Rietveld 408576698