aboutsummaryrefslogtreecommitdiff
path: root/node_modules/descriptor.json
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-03 14:22:18 -0700
committerJohn Mayhew2012-07-03 14:22:18 -0700
commit31e63b442631f1c7dff34a661e40e703cb42dea5 (patch)
treee8f7da8966ccf3be60fa4e157ac2cc0353a67e81 /node_modules/descriptor.json
parent79764532dc4f50789c066d528ae7911e3e8d62b4 (diff)
parentfcae5717dab144c4d961b94510aed11d01568345 (diff)
downloadninja-31e63b442631f1c7dff34a661e40e703cb42dea5.tar.gz
Merge branch 'master' of github.com:mayhewinator/ninja-internal
Diffstat (limited to 'node_modules/descriptor.json')
-rw-r--r--node_modules/descriptor.json4
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",