diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json')
-rwxr-xr-x | node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json deleted file mode 100755 index 4dcc16c6..00000000 --- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | { | ||
2 | "name": "loader", | ||
3 | "version": "0.0.0", | ||
4 | "mappings": { | ||
5 | "montage": "../../../../" | ||
6 | }, | ||
7 | "directories": { | ||
8 | "lib": "" | ||
9 | } | ||
10 | } | ||