aboutsummaryrefslogtreecommitdiff
path: root/images/optionsbar/selection
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 10:44:45 -0700
committerKruti Shah2012-05-31 10:44:45 -0700
commitc350cc1c060fdf17357ddadce024267943784593 (patch)
tree453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /images/optionsbar/selection
parentfdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff)
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
downloadninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'images/optionsbar/selection')
-rwxr-xr-ximages/optionsbar/selection/AlignBottom.pngbin2852 -> 2887 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/AlignCenter.png (renamed from images/optionsbar/selection/alignHcenter.png)bin2859 -> 2859 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/AlignMiddle.png (renamed from images/optionsbar/selection/alignVcenter.png)bin2864 -> 2864 bytes
-rw-r--r--images/optionsbar/selection/ArrangeBringForward.pngbin0 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/ArrangeBringToFront.pngbin0 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/ArrangeSendBackward.pngbin0 -> 2873 bytes
-rw-r--r--images/optionsbar/selection/ArrangeSendToBack.pngbin0 -> 2877 bytes
-rw-r--r--images/optionsbar/selection/DistBottom.pngbin0 -> 2888 bytes
-rw-r--r--[-rwxr-xr-x]images/optionsbar/selection/DistMiddle.png (renamed from images/optionsbar/selection/distVcenter.png)bin2868 -> 2868 bytes
9 files changed, 0 insertions, 0 deletions
diff --git a/images/optionsbar/selection/AlignBottom.png b/images/optionsbar/selection/AlignBottom.png
index 842cb057..f68d62c8 100755
--- a/images/optionsbar/selection/AlignBottom.png
+++ b/images/optionsbar/selection/AlignBottom.png
Binary files differ
diff --git a/images/optionsbar/selection/alignHcenter.png b/images/optionsbar/selection/AlignCenter.png
index 64bb4014..64bb4014 100755..100644
--- a/images/optionsbar/selection/alignHcenter.png
+++ b/images/optionsbar/selection/AlignCenter.png
Binary files differ
diff --git a/images/optionsbar/selection/alignVcenter.png b/images/optionsbar/selection/AlignMiddle.png
index 03dffad5..03dffad5 100755..100644
--- a/images/optionsbar/selection/alignVcenter.png
+++ b/images/optionsbar/selection/AlignMiddle.png
Binary files differ
diff --git a/images/optionsbar/selection/ArrangeBringForward.png b/images/optionsbar/selection/ArrangeBringForward.png
new file mode 100644
index 00000000..55861b5a
--- /dev/null
+++ b/images/optionsbar/selection/ArrangeBringForward.png
Binary files differ
diff --git a/images/optionsbar/selection/ArrangeBringToFront.png b/images/optionsbar/selection/ArrangeBringToFront.png
new file mode 100644
index 00000000..1344e618
--- /dev/null
+++ b/images/optionsbar/selection/ArrangeBringToFront.png
Binary files differ
diff --git a/images/optionsbar/selection/ArrangeSendBackward.png b/images/optionsbar/selection/ArrangeSendBackward.png
new file mode 100644
index 00000000..2e8ea0ad
--- /dev/null
+++ b/images/optionsbar/selection/ArrangeSendBackward.png
Binary files differ
diff --git a/images/optionsbar/selection/ArrangeSendToBack.png b/images/optionsbar/selection/ArrangeSendToBack.png
new file mode 100644
index 00000000..699ae5ba
--- /dev/null
+++ b/images/optionsbar/selection/ArrangeSendToBack.png
Binary files differ
diff --git a/images/optionsbar/selection/DistBottom.png b/images/optionsbar/selection/DistBottom.png
new file mode 100644
index 00000000..c7ed75ce
--- /dev/null
+++ b/images/optionsbar/selection/DistBottom.png
Binary files differ
diff --git a/images/optionsbar/selection/distVcenter.png b/images/optionsbar/selection/DistMiddle.png
index bb32a441..bb32a441 100755..100644
--- a/images/optionsbar/selection/distVcenter.png
+++ b/images/optionsbar/selection/DistMiddle.png
Binary files differ