diff options
| author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
| commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
| tree | e778f2b9d5d525aa364360d5996536a0a06379bd /node_modules/montage/examples/youtube-channel-example/package.json | |
| parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz | |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
Diffstat (limited to 'node_modules/montage/examples/youtube-channel-example/package.json')
| -rwxr-xr-x | node_modules/montage/examples/youtube-channel-example/package.json | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/node_modules/montage/examples/youtube-channel-example/package.json b/node_modules/montage/examples/youtube-channel-example/package.json new file mode 100755 index 00000000..ecfbdd8a --- /dev/null +++ b/node_modules/montage/examples/youtube-channel-example/package.json | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | { | ||
| 2 | "name": "youtube-channel-example", | ||
| 3 | "version": "0.0.0", | ||
| 4 | "mappings": { | ||
| 5 | "montage": "../../" | ||
| 6 | } | ||
| 7 | } \ No newline at end of file | ||