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/montage/package.json | |
| 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/montage/package.json')
| -rwxr-xr-x | node_modules/montage/package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/package.json b/node_modules/montage/package.json index 66501166..ce4b31d5 100755 --- a/node_modules/montage/package.json +++ b/node_modules/montage/package.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "montage", | 2 | "name": "montage", |
| 3 | "version": "0.7.0", | 3 | "version": "0.9.0", |
| 4 | "description": "A UI Framework", | 4 | "description": "A UI Framework", |
| 5 | "main": "montage", | 5 | "main": "montage", |
| 6 | "overlay": { | 6 | "overlay": { |