aboutsummaryrefslogtreecommitdiff
path: root/images/optionsbar/zoom
diff options
context:
space:
mode:
authorAnanya Sen2012-05-31 10:13:40 -0700
committerAnanya Sen2012-05-31 10:13:40 -0700
commit286457b4f23974277274ba388afd283e8aa085cb (patch)
treec21bf791e7c4f572d12f97987ea6b89e74da67fe /images/optionsbar/zoom
parent4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff)
parentd49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
downloadninja-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/zoom')
-rwxr-xr-ximages/optionsbar/zoom/zoom_minus.pngbin3117 -> 648 bytes
-rwxr-xr-ximages/optionsbar/zoom/zoom_plus.pngbin3128 -> 691 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/images/optionsbar/zoom/zoom_minus.png b/images/optionsbar/zoom/zoom_minus.png
index e337dd68..530c89d5 100755
--- a/images/optionsbar/zoom/zoom_minus.png
+++ b/images/optionsbar/zoom/zoom_minus.png
Binary files differ
diff --git a/images/optionsbar/zoom/zoom_plus.png b/images/optionsbar/zoom/zoom_plus.png
index c92d839d..de47235c 100755
--- a/images/optionsbar/zoom/zoom_plus.png
+++ b/images/optionsbar/zoom/zoom_plus.png
Binary files differ