remoting/host/win/remoting_core.manifest - Issue 12189013: Relanding r180433, now without build/some.gyp.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12189013: Relanding r180433, now without build/some.gyp. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 7 years, 10 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/app/chrome.dll.manifest b/remoting/host/win/remoting_core.manifest

similarity index 52%

copy from chrome/app/chrome.dll.manifest

copy to remoting/host/win/remoting_core.manifest

index c2de75352d9e2170ea8af2331860747047b867c6..d3517547db9e2a107ebcdeceb0f292a1d1000fbe 100644

--- a/chrome/app/chrome.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>

-</assembly>

+<?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="*" />

+ </dependentAssembly>

+ </dependency>

+</assembly>

« no previous file with comments | « remoting/host/win/host_service_resource.h ('k') | remoting/host/win/remoting_core.ver » ('j') | no next file with comments »