diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-12 03:37:35 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-12 03:37:35 +0000 |
| commit | 27a2aae746ee0b24f6a04973f40d38f5ba0b8f5a (patch) | |
| tree | 2e75d615198ac4963a2d42a45cdfe0e954d3506c | |
| parent | aeb8053ed3f1f7a21834628cbafdfdf5dba2fa68 (diff) | |
| download | chromium_src-27a2aae746ee0b24f6a04973f40d38f5ba0b8f5a.zip chromium_src-27a2aae746ee0b24f6a04973f40d38f5ba0b8f5a.tar.gz chromium_src-27a2aae746ee0b24f6a04973f40d38f5ba0b8f5a.tar.bz2 | |
Fix bad merge conflict resolution from r109765
TBR=nduca
BUG=none
TEST=waterfall
Review URL: http://codereview.chromium.org/8538037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109769 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_resources.grd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 3b132db..a7db110 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -61,9 +61,9 @@ <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list.json" type="BINDATA" /> - <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> - <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\software_rendering_list.json" type="BINDATA" /> + <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_internals.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_HISTORY2_JS" file="resources\history2.js" type="BINDATA" /> <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> |