diff options
| author | Armen Kesablyan | 2012-07-03 12:22:27 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-07-03 12:22:27 -0700 |
| commit | 1b3a5532573cbd412a98d33026a34554955c0f04 (patch) | |
| tree | edc8f1f7d7628a52af8a41202310ae482bb4d4bd /node_modules/descriptor.json | |
| parent | 3d3e37c55e96b74c6c0a2841574fb03814d52999 (diff) | |
| parent | bd7586079d77b51334f1c15ffafcc26a679aa9ce (diff) | |
| download | ninja-1b3a5532573cbd412a98d33026a34554955c0f04.tar.gz | |
Merge branch 'refs/heads/master' into GIO-TextTool
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", |