webkit/tools/test_shell/test_shell.gypi - Issue 10806018: Revert 147288 - Renamed resource files to be more verbose, specifically:

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: webkit/tools/test_shell/test_shell.gypi

Issue 10806018: Revert 147288 - Renamed resource files to be more verbose, specifically: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 5 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: webkit/tools/test_shell/test_shell.gypi

===================================================================

--- webkit/tools/test_shell/test_shell.gypi (revision 147292)

+++ webkit/tools/test_shell/test_shell.gypi (working copy)

@@ -174,7 +174,7 @@

'pak_inputs': [

'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',

- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',

'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',

Property changes on: webkit/tools/test_shell/test_shell.gypi

___________________________________________________________________

Deleted: svn:mergeinfo

Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/tools/test_shell/test_shell.gypi:r3734-4217,4606-5108,5177-5263

« no previous file with comments | « ui/views/views.gyp ('k') | no next file » | no next file with comments »