diff options
| author | Nivesh Rajbhandari | 2012-07-09 11:52:02 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-07-09 11:52:02 -0700 |
| commit | febfdb18042d1c73ac58ee4e35c5f176428dee00 (patch) | |
| tree | 516a29ca99d4aae0d5228223fff438c1a3c4e0d3 /node_modules/descriptor.json | |
| parent | ac27d538af33ca8d67d3d88729f49c05793afda7 (diff) | |
| parent | aedd14b18695d031f695d27dfbd94df5614495bb (diff) | |
| download | ninja-febfdb18042d1c73ac58ee4e35c5f176428dee00.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Conflicts:
js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
js/panels/Materials/materials-popup.reel/materials-popup.css
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'node_modules/descriptor.json')
| -rw-r--r-- | node_modules/descriptor.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json index 9a2177c6..c25354ee 100644 --- a/node_modules/descriptor.json +++ b/node_modules/descriptor.json | |||
| @@ -215,8 +215,8 @@ | |||
| 215 | "montage/ui/bluemoon/slider.reel/slider.css", | 215 | "montage/ui/bluemoon/slider.reel/slider.css", |
| 216 | "montage/ui/bluemoon/slider.reel/slider.html", | 216 | "montage/ui/bluemoon/slider.reel/slider.html", |
| 217 | "montage/ui/bluemoon/slider.reel/slider.js", | 217 | "montage/ui/bluemoon/slider.reel/slider.js", |
| 218 | "montage/ui/bluemoon/tabs.reel/tabs.js", | 218 | "montage/ui/bluemoon/tabs.reel/tabs.css", |
| 219 | "montage/ui/bluemoon/tabs.reel/tabs.js", | 219 | "montage/ui/bluemoon/tabs.reel/tabs.html", |
| 220 | "montage/ui/bluemoon/tabs.reel/tabs.js", | 220 | "montage/ui/bluemoon/tabs.reel/tabs.js", |
| 221 | "montage/ui/bluemoon/textarea.reel/textarea.css", | 221 | "montage/ui/bluemoon/textarea.reel/textarea.css", |
| 222 | "montage/ui/bluemoon/textarea.reel/textarea.html", | 222 | "montage/ui/bluemoon/textarea.reel/textarea.html", |