diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /node_modules/montage-google/package.json | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
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 | ||