diff options
| author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
| commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
| tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/io/system | |
| parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
| parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
| download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/io/system')
| -rw-r--r-- | js/io/system/ninjalibrary.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index e9df5e58..fb108937 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.1.0"}, |
| 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.9.0"} | 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.0"} |
| 5 | ] | 5 | ] |
| 6 | } \ No newline at end of file | 6 | } \ No newline at end of file |