diff options
author | Jose Antonio Marquez | 2012-02-08 14:53:40 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-08 14:53:40 -0800 |
commit | 5a69d5be181ea98fa842977885ebd8c861dda6ca (patch) | |
tree | a417e0e6bc41c417a33017299c40435e6d557d09 /versions.json | |
parent | 2133bd1e74864b4b69d824ba7977fa07034af962 (diff) | |
parent | 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff) | |
download | ninja-5a69d5be181ea98fa842977885ebd8c861dda6ca.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
manifest.json
Diffstat (limited to 'versions.json')
-rw-r--r-- | versions.json | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/versions.json b/versions.json deleted file mode 100644 index 017e22ce..00000000 --- a/versions.json +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | { | ||
2 | "ninja": { | ||
3 | "version": "0.5.5" | ||
4 | }, | ||
5 | "montage": { | ||
6 | "version": "0.6.0" | ||
7 | } | ||
8 | } \ No newline at end of file | ||