diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /node_modules/montage-google/package.json | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'node_modules/montage-google/package.json')
| -rwxr-xr-x | node_modules/montage-google/package.json | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/node_modules/montage-google/package.json b/node_modules/montage-google/package.json new file mode 100755 index 00000000..9cb96270 --- /dev/null +++ b/node_modules/montage-google/package.json | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | |||
| 2 | { | ||
| 3 | "name": "google-components", | ||
| 4 | "version": "0.1.0", | ||
| 5 | "description": "Google specific components", | ||
| 6 | "main": "google", | ||
| 7 | "mappings": { | ||
| 8 | "montage" : "../montage/" | ||
| 9 | }, | ||
| 10 | "dependency": { | ||
| 11 | "montage" : "0.8" | ||
| 12 | } | ||
| 13 | |||
| 14 | } \ No newline at end of file | ||