diff options
author | Jonathan Duran | 2012-06-22 01:36:10 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-22 01:36:10 -0700 |
commit | 020ad879a627c4234a8732f05e175ad69cedf180 (patch) | |
tree | 743ea0d3a3af9cae65d5af531a6dba1951b03b33 /manifest.json | |
parent | 04f206173530b6efde16b934b1f959b255d18441 (diff) | |
parent | 2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff) | |
download | ninja-020ad879a627c4234a8732f05e175ad69cedf180.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefix
Diffstat (limited to 'manifest.json')
-rw-r--r-- | manifest.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json index e9406399..f1703b99 100644 --- a/manifest.json +++ b/manifest.json | |||
@@ -15,7 +15,9 @@ | |||
15 | "notifications", | 15 | "notifications", |
16 | "webRequest", | 16 | "webRequest", |
17 | "webRequestBlocking", | 17 | "webRequestBlocking", |
18 | "http://ninja/*" | 18 | "http://ninja/*", |
19 | "clipboardRead", | ||
20 | "clipboardWrite" | ||
19 | ], | 21 | ], |
20 | "requirements": { | 22 | "requirements": { |
21 | "3D": { | 23 | "3D": { |