diff options
| author | Jon Reid | 2012-06-25 11:07:33 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-25 11:07:33 -0700 |
| commit | 831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch) | |
| tree | aa6acda9aeddad8f93cae63b955349a442ddf01f /manifest.json | |
| parent | 82638621ed793fcb37438798363dba151efd9cd2 (diff) | |
| parent | da3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff) | |
| download | ninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolution: Use both.
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": { |