diff options
author | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
commit | 5496f0060c5f43e7951a110241a18b9e631761bb (patch) | |
tree | bd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/panels/color/colorchippopup.reel/img | |
parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
parent | ec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff) | |
download | ninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/color/colorchippopup.reel/img')
-rwxr-xr-x | js/panels/color/colorchippopup.reel/img/icon_bitmap.png | bin | 3072 -> 0 bytes |
-rwxr-xr-x | js/panels/color/colorchippopup.reel/img/icon_colorwheel.png | bin | 3420 -> 0 bytes |
-rwxr-xr-x | js/panels/color/colorchippopup.reel/img/icon_gradient.png | bin | 2815 -> 0 bytes |
-rwxr-xr-x | js/panels/color/colorchippopup.reel/img/icon_nofill.png | bin | 2951 -> 0 bytes |
-rwxr-xr-x | js/panels/color/colorchippopup.reel/img/knob.png | bin | 1036 -> 0 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/js/panels/color/colorchippopup.reel/img/icon_bitmap.png b/js/panels/color/colorchippopup.reel/img/icon_bitmap.png deleted file mode 100755 index 3d6bf1fb..00000000 --- a/js/panels/color/colorchippopup.reel/img/icon_bitmap.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/js/panels/color/colorchippopup.reel/img/icon_colorwheel.png b/js/panels/color/colorchippopup.reel/img/icon_colorwheel.png deleted file mode 100755 index a2850f4f..00000000 --- a/js/panels/color/colorchippopup.reel/img/icon_colorwheel.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/js/panels/color/colorchippopup.reel/img/icon_gradient.png b/js/panels/color/colorchippopup.reel/img/icon_gradient.png deleted file mode 100755 index 887eee13..00000000 --- a/js/panels/color/colorchippopup.reel/img/icon_gradient.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/js/panels/color/colorchippopup.reel/img/icon_nofill.png b/js/panels/color/colorchippopup.reel/img/icon_nofill.png deleted file mode 100755 index 0c6311a0..00000000 --- a/js/panels/color/colorchippopup.reel/img/icon_nofill.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/js/panels/color/colorchippopup.reel/img/knob.png b/js/panels/color/colorchippopup.reel/img/knob.png deleted file mode 100755 index ecfbfcec..00000000 --- a/js/panels/color/colorchippopup.reel/img/knob.png +++ /dev/null | |||
Binary files differ | |||