aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorhwc4872012-03-22 15:47:11 -0700
committerhwc4872012-03-22 15:47:11 -0700
commite927e4702d7dbd4a878f6979b3f56b46758f93de (patch)
treee6bb8951374a6504bd6c745ce7233da5cd4869dc /js/io
parent00cd98e49c959906d7c44bb6adcdef1f3d5148ae (diff)
parent31e924e1b8b8da8342b3ff2341c8284915486c0b (diff)
downloadninja-e927e4702d7dbd4a878f6979b3f56b46758f93de.tar.gz
Merge branch 'integration' of github.com:ericmueller/ninja-internal into Textures
Diffstat (limited to 'js/io')
-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 00ee7ed2..a863a135 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.6.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.6.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.1.0"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.1.2"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file