aboutsummaryrefslogtreecommitdiff
path: root/assets/images
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-27 09:32:53 -0700
committerNivesh Rajbhandari2012-03-27 09:32:53 -0700
commit406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (patch)
tree3a8b45f4802f002269ff1bcf596f94cee4679a07 /assets/images
parentbda9f8f5829c943486f8850e68c991e83f8fb8c8 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-406bbfc63f8ed42d7da105dbd068a49ff8fb5f09.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'assets/images')
-rw-r--r--assets/images/paris.pngbin0 -> 4108 bytes
-rw-r--r--assets/images/powderblue.pngbin0 -> 176 bytes
-rw-r--r--assets/images/raiders.pngbin0 -> 5674 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/assets/images/paris.png b/assets/images/paris.png
new file mode 100644
index 00000000..b7ef6c7b
--- /dev/null
+++ b/assets/images/paris.png
Binary files differ
diff --git a/assets/images/powderblue.png b/assets/images/powderblue.png
new file mode 100644
index 00000000..a4ef33b4
--- /dev/null
+++ b/assets/images/powderblue.png
Binary files differ
diff --git a/assets/images/raiders.png b/assets/images/raiders.png
new file mode 100644
index 00000000..64c39c89
--- /dev/null
+++ b/assets/images/raiders.png
Binary files differ