diff options
| author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
| commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
| tree | e778f2b9d5d525aa364360d5996536a0a06379bd /assets/images | |
| parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz | |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
Diffstat (limited to 'assets/images')
| -rw-r--r-- | assets/images/paris.png | bin | 0 -> 4108 bytes |
| -rw-r--r-- | assets/images/powderblue.png | bin | 0 -> 176 bytes |
| -rw-r--r-- | assets/images/raiders.png | bin | 0 -> 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 | |||
