diff options
author | Armen Kesablyan | 2012-06-20 15:00:34 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:00:34 -0700 |
commit | 38f571d1fdf02d36c3816637af7b2ca2493809da (patch) | |
tree | 69b97839be8b2b6fb65e9150d4dc02856041fb1d /js/io | |
parent | f7c14e54c52bce8875cde81db621dde6f4ff1e34 (diff) | |
parent | 120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff) | |
download | ninja-38f571d1fdf02d36c3816637af7b2ca2493809da.tar.gz |
Merge branch 'refs/heads/master' into binding
Diffstat (limited to 'js/io')
-rw-r--r-- | js/io/system/ninjalibrary.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index fb108937..de11034b 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.10.1.0"}, | 3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.1.0"}, |
4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.0"} | 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.2"} |
5 | ] | 5 | ] |
6 | } \ No newline at end of file | 6 | } \ No newline at end of file |