summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 07:08:32 +0000
committerddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 07:08:32 +0000
commit6e0c878032f44a770d604b3d60e9f96b14cf27d7 (patch)
tree145a5ebc8a677aa90c3bad1d707912e758e073b8 /.gitignore
parentf88628791d00eaf5ae34aff349bf32e39f7a462e (diff)
downloadchromium_src-6e0c878032f44a770d604b3d60e9f96b14cf27d7.zip
chromium_src-6e0c878032f44a770d604b3d60e9f96b14cf27d7.tar.gz
chromium_src-6e0c878032f44a770d604b3d60e9f96b14cf27d7.tar.bz2
Replace Chromium's content_decryption_module.h with the independent DEPS'd instance.
This allows third-party CDMs to be built before rolling potentially breaking changes into Chrome. TEST=build succeeds and existing External CDM tests. Review URL: https://codereview.chromium.org/11568045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index d99bd72..4bf5911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -279,6 +279,7 @@ v8.log
/webkit/data/layout_tests/LayoutTests
/webkit/data/test_shell/plugins
/webkit/data/xbm_decoder
+/webkit/media/crypto/ppapi/cdm
/webpagereplay_logs/
/x86-generic_out/
/xcodebuild