diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /images/optionsbar/selection | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'images/optionsbar/selection')
| -rwxr-xr-x | images/optionsbar/selection/AlignBottom.png | bin | 2852 -> 2887 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/optionsbar/selection/AlignCenter.png (renamed from images/optionsbar/selection/alignHcenter.png) | bin | 2859 -> 2859 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/optionsbar/selection/AlignMiddle.png (renamed from images/optionsbar/selection/alignVcenter.png) | bin | 2864 -> 2864 bytes |
| -rw-r--r-- | images/optionsbar/selection/ArrangeBringForward.png | bin | 0 -> 2877 bytes |
| -rw-r--r-- | images/optionsbar/selection/ArrangeBringToFront.png | bin | 0 -> 2877 bytes |
| -rw-r--r-- | images/optionsbar/selection/ArrangeSendBackward.png | bin | 0 -> 2873 bytes |
| -rw-r--r-- | images/optionsbar/selection/ArrangeSendToBack.png | bin | 0 -> 2877 bytes |
| -rw-r--r-- | images/optionsbar/selection/DistBottom.png | bin | 0 -> 2888 bytes |
| -rw-r--r--[-rwxr-xr-x] | images/optionsbar/selection/DistMiddle.png (renamed from images/optionsbar/selection/distVcenter.png) | bin | 2868 -> 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 | |||
