diff options
| author | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
| commit | 18243deb66ab14a014756bfb0be1a52648c7771a (patch) | |
| tree | c64660f7f69840cac5186fd730221335bd0a67af /versions.json | |
| parent | 802e92eb70b00849dadacf2c6590d27edbe65d99 (diff) | |
| parent | 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff) | |
| download | ninja-18243deb66ab14a014756bfb0be1a52648c7771a.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/MaterialsLibrary.js
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 | ||