diff options
author | Ananya Sen | 2012-01-31 07:00:49 -0800 |
---|---|---|
committer | Ananya Sen | 2012-01-31 07:00:49 -0800 |
commit | 61ff730a1897890f71403cbfac4d15269e2d271f (patch) | |
tree | 4a2893e935c259ec9fbe9446d64af5172ec6299d /versions.json | |
parent | 906776893138257f96a0530674eda456ca3d817b (diff) | |
parent | 6dc03672707a91085954359d82c14bd876f85b12 (diff) | |
download | ninja-61ff730a1897890f71403cbfac4d15269e2d271f.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
_scss/imports/scss/_Stage.scss
js/io/system/coreioapi.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'versions.json')
-rw-r--r-- | versions.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/versions.json b/versions.json new file mode 100644 index 00000000..2d568314 --- /dev/null +++ b/versions.json | |||
@@ -0,0 +1,8 @@ | |||
1 | { | ||
2 | "ninja": { | ||
3 | "version": "0.5.0" | ||
4 | }, | ||
5 | "montage": { | ||
6 | "version": "0.5.1" | ||
7 | } | ||
8 | } \ No newline at end of file | ||