diff options
| author | hwc487 | 2012-05-11 11:28:15 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 11:28:15 -0700 |
| commit | 634194bf87744dd6f693380ec878cc5dd42207a1 (patch) | |
| tree | 9652bf677abb71b56582deb9c46fb2dcb7d9a687 /js/io | |
| parent | d1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988 (diff) | |
| parent | e2ef92008a39a67d4f7db0627c7352bdc06ed476 (diff) | |
| download | ninja-634194bf87744dd6f693380ec878cc5dd42207a1.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Conflicts:
js/lib/geom/circle.js
js/lib/geom/rectangle.js
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 f7b87a91..feced079 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.8.0.0"}, | 3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.8.0.0"}, |
| 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.0"} | 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.6.0"} |
| 5 | ] | 5 | ] |
| 6 | } \ No newline at end of file | 6 | } \ No newline at end of file |