diff options
| author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
| commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
| tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /images | |
| parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
| parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
| download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'images')
| -rw-r--r-- | images/cursors/binding.png | bin | 0 -> 1359 bytes |
| -rw-r--r-- | images/panels/horizontal-resize.png | bin | 0 -> 1031 bytes |
| -rw-r--r-- | images/tools/binding.png | bin | 0 -> 1140 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/images/cursors/binding.png b/images/cursors/binding.png new file mode 100644 index 00000000..16e84574 --- /dev/null +++ b/images/cursors/binding.png | |||
| Binary files differ | |||
diff --git a/images/panels/horizontal-resize.png b/images/panels/horizontal-resize.png new file mode 100644 index 00000000..7b2cf8a5 --- /dev/null +++ b/images/panels/horizontal-resize.png | |||
| Binary files differ | |||
diff --git a/images/tools/binding.png b/images/tools/binding.png new file mode 100644 index 00000000..33545ee1 --- /dev/null +++ b/images/tools/binding.png | |||
| Binary files differ | |||
