summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorjrummell <jrummell@chromium.org>2015-10-21 16:26:26 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-21 23:27:18 +0000
commitf715b1695cf753932f07b0ff54737fee7aff96c6 (patch)
treed53677ec3c7ebc7b7357b524fee4735a9f3a10d7 /.gitignore
parent089a54faf9bc88704ad6c0d76063aa68209a74e5 (diff)
downloadchromium_src-f715b1695cf753932f07b0ff54737fee7aff96c6.zip
chromium_src-f715b1695cf753932f07b0ff54737fee7aff96c6.tar.gz
chromium_src-f715b1695cf753932f07b0ff54737fee7aff96c6.tar.bz2
Move CDM header out of cdm/ppapi directory
As content_decryption_module.h will be used by more than just ppapi, move the DEPS directory up one level. TEST=compiles Review URL: https://codereview.chromium.org/1419933002 Cr-Commit-Position: refs/heads/master@{#355429}
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 16b9209..cb00641 100644
--- a/.gitignore
+++ b/.gitignore
@@ -178,7 +178,7 @@ v8.log
/ios/third_party/gcdwebserver/src
/llvm
/media/cast/logging/cast_logging_proto_lib.xml
-/media/cdm/ppapi/api
+/media/cdm/api
/media/media_asm.xml
/media/media_mojo_bindings.xml
/media/test/data/internal