diff options
| author | hwc487 | 2012-03-09 14:31:18 -0800 |
|---|---|---|
| committer | hwc487 | 2012-03-09 14:31:18 -0800 |
| commit | ba0e84e74293c10817f9377f66c9dcfa0a15ce60 (patch) | |
| tree | 0cde5f80f0b1a1da904cbab84418ae480cd8abb5 /assets/descriptor.json | |
| parent | a5d4d57a3575bb3b97fe692ddffca3127463ae94 (diff) | |
| parent | 30c20960190e76cdcff0a3b2036c881dc751e05e (diff) | |
| download | ninja-ba0e84e74293c10817f9377f66c9dcfa0a15ce60.tar.gz | |
Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into integration
Conflicts:
js/document/html-document.js
Diffstat (limited to 'assets/descriptor.json')
| -rw-r--r-- | assets/descriptor.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json index fb56d208..2b955c40 100644 --- a/assets/descriptor.json +++ b/assets/descriptor.json | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | "directories": [{"name": "images"}, {"name": "shaders"}], | 5 | "directories": [{"name": "images"}, {"name": "shaders"}], |
| 6 | "files": [ | 6 | "files": [ |
| 7 | "CanvasRuntime.js", | 7 | "CanvasRuntime.js", |
| 8 | "rdge-compiled.js", | ||
| 8 | "images/black.png", | 9 | "images/black.png", |
| 9 | "images/blue.png", | 10 | "images/blue.png", |
| 10 | "images/BoxB2_AO.png", | 11 | "images/BoxB2_AO.png", |