aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-06 09:55:35 -0700
committerPushkar Joshi2012-06-06 09:55:35 -0700
commitcf3087b78d771ef89b0d5557430fd594f71cf063 (patch)
tree3e6462ff791c9b3bc85157b53a96c1d1284ece7c /js/io
parentcfa1402ac2ce831a83a9d4263d06c452c157a414 (diff)
parentea195af100d327aac68ada28387fe8259d0f31f4 (diff)
downloadninja-cf3087b78d771ef89b0d5557430fd594f71cf063.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: assets/canvas-runtime.js
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 19ad97e8..e9df5e58 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.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.8.0"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.9.0"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file