aboutsummaryrefslogtreecommitdiff
path: root/images/optionsbar/selection
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /images/optionsbar/selection
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'images/optionsbar/selection')
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/AlignBottom.pngbin2852 -> 2852 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/alignHcenter.pngbin2859 -> 2859 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/alignLeft.pngbin2847 -> 2847 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/alignRight.pngbin2851 -> 2851 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/alignTop.pngbin2856 -> 2856 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/alignVcenter.pngbin2864 -> 2864 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/distCenter.pngbin2868 -> 2868 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/distLeft.pngbin2856 -> 2856 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/distRight.pngbin2851 -> 2851 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/distTop.pngbin2856 -> 2856 bytes
-rwxr-xr-x[-rw-r--r--]images/optionsbar/selection/distVcenter.pngbin2868 -> 2868 bytes
11 files changed, 0 insertions, 0 deletions
diff --git a/images/optionsbar/selection/AlignBottom.png b/images/optionsbar/selection/AlignBottom.png
index 842cb057..842cb057 100644..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/alignHcenter.png
index 64bb4014..64bb4014 100644..100755
--- a/images/optionsbar/selection/alignHcenter.png
+++ b/images/optionsbar/selection/alignHcenter.png
Binary files differ
diff --git a/images/optionsbar/selection/alignLeft.png b/images/optionsbar/selection/alignLeft.png
index 822c5243..822c5243 100644..100755
--- a/images/optionsbar/selection/alignLeft.png
+++ b/images/optionsbar/selection/alignLeft.png
Binary files differ
diff --git a/images/optionsbar/selection/alignRight.png b/images/optionsbar/selection/alignRight.png
index 07d6d7ef..07d6d7ef 100644..100755
--- a/images/optionsbar/selection/alignRight.png
+++ b/images/optionsbar/selection/alignRight.png
Binary files differ
diff --git a/images/optionsbar/selection/alignTop.png b/images/optionsbar/selection/alignTop.png
index 378d8aab..378d8aab 100644..100755
--- a/images/optionsbar/selection/alignTop.png
+++ b/images/optionsbar/selection/alignTop.png
Binary files differ
diff --git a/images/optionsbar/selection/alignVcenter.png b/images/optionsbar/selection/alignVcenter.png
index 03dffad5..03dffad5 100644..100755
--- a/images/optionsbar/selection/alignVcenter.png
+++ b/images/optionsbar/selection/alignVcenter.png
Binary files differ
diff --git a/images/optionsbar/selection/distCenter.png b/images/optionsbar/selection/distCenter.png
index cf8f2bf5..cf8f2bf5 100644..100755
--- a/images/optionsbar/selection/distCenter.png
+++ b/images/optionsbar/selection/distCenter.png
Binary files differ
diff --git a/images/optionsbar/selection/distLeft.png b/images/optionsbar/selection/distLeft.png
index 3849e9e6..3849e9e6 100644..100755
--- a/images/optionsbar/selection/distLeft.png
+++ b/images/optionsbar/selection/distLeft.png
Binary files differ
diff --git a/images/optionsbar/selection/distRight.png b/images/optionsbar/selection/distRight.png
index e350b53e..e350b53e 100644..100755
--- a/images/optionsbar/selection/distRight.png
+++ b/images/optionsbar/selection/distRight.png
Binary files differ
diff --git a/images/optionsbar/selection/distTop.png b/images/optionsbar/selection/distTop.png
index 1d474b3c..1d474b3c 100644..100755
--- a/images/optionsbar/selection/distTop.png
+++ b/images/optionsbar/selection/distTop.png
Binary files differ
diff --git a/images/optionsbar/selection/distVcenter.png b/images/optionsbar/selection/distVcenter.png
index bb32a441..bb32a441 100644..100755
--- a/images/optionsbar/selection/distVcenter.png
+++ b/images/optionsbar/selection/distVcenter.png
Binary files differ