aboutsummaryrefslogtreecommitdiff
path: root/assets/descriptor.json
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-21 18:04:27 -0800
committerJose Antonio Marquez2012-02-21 18:04:27 -0800
commit25e6a03cf8af4bd0496a8b21c82332d76ddd9fff (patch)
tree9b4ef3a716139d5259261cae97e8603a1d33a91f /assets/descriptor.json
parent20dc41e571ddec6b781653fac43e2ca34026937d (diff)
parent2f24dafec79583547fe663d5a387d8ef15aae3bf (diff)
downloadninja-25e6a03cf8af4bd0496a8b21c82332d76ddd9fff.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'assets/descriptor.json')
-rw-r--r--assets/descriptor.json1
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",