summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-02 16:25:59 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-02 16:25:59 +0000
commitcf59628faab8ca22ae602292cc442dce1bf258c1 (patch)
tree704496015deee525cb2402ec9e4f20ce892fbc23 /.gitignore
parentd6ae0705254b8faeb1e00d3a42d3e6d3c09461a3 (diff)
downloadchromium_src-cf59628faab8ca22ae602292cc442dce1bf258c1.zip
chromium_src-cf59628faab8ca22ae602292cc442dce1bf258c1.tar.gz
chromium_src-cf59628faab8ca22ae602292cc442dce1bf258c1.tar.bz2
Adds third_party/ffmpeg (and removes old subdirectories) to .gitignore
(this is a follow up on r48704 and r48703) Review URL: http://codereview.chromium.org/2457002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 48df1ab..66e3e04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,8 +56,7 @@
/third_party/chromeos_text_input
/third_party/cros
/third_party/cygwin
-/third_party/ffmpeg/binaries
-/third_party/ffmpeg/source/patched-ffmpeg-mt
+/third_party/ffmpeg
/third_party/forge
/third_party/googlemac
/third_party/gles2_conform