summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-12 04:16:18 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-12 04:16:18 +0000
commitf92b15bd647707000eebd0900370dda129646e79 (patch)
tree1b3cdf1603487c2be6c40ad3ed6da1d18370174a /.gitignore
parent0ea9f7c8685aa8c806d005bd88b209da7975ebd2 (diff)
downloadchromium_src-f92b15bd647707000eebd0900370dda129646e79.zip
chromium_src-f92b15bd647707000eebd0900370dda129646e79.tar.gz
chromium_src-f92b15bd647707000eebd0900370dda129646e79.tar.bz2
Move prepopulated_engines to components/search_engines
Move search_engine_type.h from chrome/browser/search_engines to components/search_engines Move prepopulated_engines* to components/search_engines TBR=asvitkine@chromium.org for the comment fix in tools/metrics/histograms/histograms.xml BUG=371535 TEST=git cl try Review URL: https://codereview.chromium.org/330433002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ad99132..1fa8470 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,7 +82,6 @@ v8.log
/chrome/browser/resources/pdf/html_office
/chrome/browser/resources/settings_internal/
/chrome/browser/resources/software_rendering_list
-/chrome/browser/search_engines/prepopulated_engines.xml
/chrome/browser/spellchecker/internal
/chrome/browser_tests_run.xml
/chrome/chrome_run.xml
@@ -136,6 +135,7 @@ v8.log
/components/chrome_settings_proto_generated_compile.xml
/components/cloud_policy_proto_generated_compile.xml
/components/rappor.xml
+/components/search_engines/prepopulated_engines.xml
/components/variations.xml
/content/content_unittests_run.xml
/content/test/data/gpu/generated/