diff options
author | Jon Reid | 2012-05-15 11:24:53 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /node_modules | |
parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'node_modules')
117 files changed, 3717 insertions, 2152 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json index 39da73f3..5e8ca527 100644 --- a/node_modules/components-data/feed-reader.json +++ b/node_modules/components-data/feed-reader.json | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | "component": "feedreader", | 2 | "component": "feedreader", |
3 | 3 | ||
4 | "module": "montage/ui/feed-reader/feed-reader.reel", | 4 | "module": "montage-google/feed-reader/feed-reader.reel", |
5 | 5 | ||
6 | "name": "FeedReader", | 6 | "name": "FeedReader", |
7 | 7 | ||
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json index 655d222d..e80fa510 100644 --- a/node_modules/components-data/map.json +++ b/node_modules/components-data/map.json | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | "component": "map", | 2 | "component": "map", |
3 | 3 | ||
4 |