diff options
| author | Valerio Virgillito | 2012-02-20 15:40:04 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-20 15:40:04 -0800 |
| commit | f6811b8b7e86bcae16f9278b5a7cfc1ea94e3909 (patch) | |
| tree | 7d12d3aca26e15fac2072498d42e2f7478f72719 /assets/descriptor.json | |
| parent | 7ec06098dcfa969017b73b91a1eec810d05775f8 (diff) | |
| parent | bd7bc833895391e4974b8746f31f63ba70689df3 (diff) | |
| download | ninja-f6811b8b7e86bcae16f9278b5a7cfc1ea94e3909.tar.gz | |
Merge branch 'refs/heads/master' into nested-selection
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 53bfb684..ef21b8b8 100644 --- a/assets/descriptor.json +++ b/assets/descriptor.json | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | "root": "/assets/", | 4 | "root": "/assets/", |
| 5 | "directories": [{"name": "images"}, {"name": "shaders"}], | 5 | "directories": [{"name": "images"}, {"name": "shaders"}], |
| 6 | "files": [ | 6 | "files": [ |
| 7 | "rdge-compiled.js", | ||
| 7 | "images/black.png", | 8 | "images/black.png", |
| 8 | "images/blue.png", | 9 | "images/blue.png", |
| 9 | "images/BoxB2_AO.png", | 10 | "images/BoxB2_AO.png", |