aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-07-03 12:22:27 -0700
committerArmen Kesablyan2012-07-03 12:22:27 -0700
commit1b3a5532573cbd412a98d33026a34554955c0f04 (patch)
treeedc8f1f7d7628a52af8a41202310ae482bb4d4bd /js
parent3d3e37c55e96b74c6c0a2841574fb03814d52999 (diff)
parentbd7586079d77b51334f1c15ffafcc26a679aa9ce (diff)
downloadninja-1b3a5532573cbd412a98d33026a34554955c0f04.tar.gz
Merge branch 'refs/heads/master' into GIO-TextTool
Diffstat (limited to 'js')
-rw-r--r--js/io/system/ninjalibrary.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index c5ccbc82..86134b97 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file