Merge branch 'refs/heads/integration'

43 files changed, 0 insertions, 0 deletions

diff --git a/images/tools/3D_rotate_obj_down.png b/images/tools/3D_rotate_obj_down.png
index d88519a0..d88519a0 100644..100755
--- a/images/tools/3D_rotate_obj_down.png
+++ b/images/tools/3D_rotate_obj_down.png
diff --git a/images/tools/3D_rotate_obj_up.png b/images/tools/3D_rotate_obj_up.png
index a2369fa7..a2369fa7 100644..100755
--- a/images/tools/3D_rotate_obj_up.png
+++ b/images/tools/3D_rotate_obj_up.png
diff --git a/images/tools/3D_rotate_stage_down.png b/images/tools/3D_rotate_stage_down.png
index b0eb69d2..b0eb69d2 100644..100755
--- a/images/tools/3D_rotate_stage_down.png
+++ b/images/tools/3D_rotate_stage_down.png
diff --git a/images/tools/3D_rotate_stage_up.png b/images/tools/3D_rotate_stage_up.png
index 856e03b6..856e03b6 100644..100755
--- a/images/tools/3D_rotate_stage_up.png
+++ b/images/tools/3D_rotate_stage_up.png
diff --git a/images/tools/3D_translate_object_down.png b/images/tools/3D_translate_object_down.png
index 0ebb90a7..0ebb90a7 100644..100755
--- a/images/tools/3D_translate_object_down.png
+++ b/images/tools/3D_translate_object_down.png
diff --git a/images/tools/3D_translate_object_up.png b/images/tools/3D_translate_object_up.png
index 81ac043b..81ac043b 100644..100755
--- a/images/tools/3D_translate_object_up.png
+++ b/images/tools/3D_translate_object_up.png
diff --git a/images/tools/3D_translate_stage_down.png b/images/tools/3D_translate_stage_down.png
index 6aa2e8b5..6aa2e8b5 100644..100755
--- a/images/tools/3D_translate_stage_down.png
+++ b/images/tools/3D_translate_stage_down.png
diff --git a/images/tools/3D_translate_stage_up.png b/images/tools/3D_translate_stage_up.png
index b98b9b89..b98b9b89 100644..100755
--- a/images/tools/3D_translate_stage_up.png
+++ b/images/tools/3D_translate_stage_up.png
diff --git a/images/tools/brush_down.png b/images/tools/brush_down.png
index 03c5d794..03c5d794 100644..100755
--- a/images/tools/brush_down.png
+++ b/images/tools/brush_down.png
diff --git a/images/tools/brush_up.png b/images/tools/brush_up.png
index b778bd32..b778bd32 100644..100755
--- a/images/tools/brush_up.png
+++ b/images/tools/brush_up.png
diff --git a/images/tools/bucket_down.png b/images/tools/bucket_down.png
index 9ddc69d6..9ddc69d6 100644..100755
--- a/images/tools/bucket_down.png
+++ b/images/tools/bucket_down.png
diff --git a/images/tools/bucket_up.png b/images/tools/bucket_up.png
index cf4e2abe..cf4e2abe 100644..100755
--- a/images/tools/bucket_up.png
+++ b/images/tools/bucket_up.png
diff --git a/images/tools/eraser_down.png b/images/tools/eraser_down.png
index 890c676b..890c676b 100644..100755
--- a/images/tools/eraser_down.png
+++ b/images/tools/eraser_down.png
diff --git a/images/tools/eraser_up.png b/images/tools/eraser_up.png
index 1311d19f..1311d19f 100644..100755
--- a/images/tools/eraser_up.png
+++ b/images/tools/eraser_up.png
diff --git a/images/tools/eyedropper_down.png b/images/tools/eyedropper_down.png
index eaf31b74..eaf31b74 100644..100755
--- a/images/tools/eyedropper_down.png
+++ b/images/tools/eyedropper_down.png
diff --git a/images/tools/eyedropper_up.png b/images/tools/eyedropper_up.png
index 021c78bf..021c78bf 100644..100755
--- a/images/tools/eyedropper_up.png
+++ b/images/tools/eyedropper_up.png
diff --git a/images/tools/hand_down.png b/images/tools/hand_down.png
index 7afd7a70..7afd7a70 100644..100755
--- a/images/tools/hand_down.png
+++ b/images/tools/hand_down.png
diff --git a/images/tools/hand_up.png b/images/tools/hand_up.png
index 4a7b8b3b..4a7b8b3b 100644..100755
--- a/images/tools/hand_up.png
+++ b/images/tools/hand_up.png
diff --git a/images/tools/inkbottle_down.png b/images/tools/inkbottle_down.png
index f07d0d25..f07d0d25 100644..100755
--- a/images/tools/inkbottle_down.png
+++ b/images/tools/inkbottle_down.png
diff --git a/images/tools/line_down.png b/images/tools/line_down.png
index 283dd2b0..283dd2b0 100644..100755
--- a/images/tools/line_down.png
+++ b/images/tools/line_down.png
diff --git a/images/tools/line_up.png b/images/tools/line_up.png
index 6435ac2b..6435ac2b 100644..100755
--- a/images/tools/line_up.png
+++ b/images/tools/line_up.png
diff --git a/images/tools/oval_down.png b/images/tools/oval_down.png
index 2dfcd675..2dfcd675 100644..100755
--- a/images/tools/oval_down.png
+++ b/images/tools/oval_down.png
diff --git a/images/tools/oval_up.png b/images/tools/oval_up.png
index 00933a6c..00933a6c 100644..100755
--- a/images/tools/oval_up.png
+++ b/images/tools/oval_up.png
diff --git a/images/tools/pen_down.png b/images/tools/pen_down.png
index e08ecd36..e08ecd36 100644..100755
--- a/images/tools/pen_down.png
+++ b/images/tools/pen_down.png
diff --git a/images/tools/pen_up.png b/images/tools/pen_up.png
index a65a2630..a65a2630 100644..100755
--- a/images/tools/pen_up.png
+++ b/images/tools/pen_up.png
diff --git a/images/tools/pencil_down.png b/images/tools/pencil_down.png
index 55b22eb2..55b22eb2 100644..100755
--- a/images/tools/pencil_down.png
+++ b/images/tools/pencil_down.png
diff --git a/images/tools/pencil_up.png b/images/tools/pencil_up.png
index f7b44c7c..f7b44c7c 100644..100755
--- a/images/tools/pencil_up.png
+++ b/images/tools/pencil_up.png
diff --git a/images/tools/rect_down.png b/images/tools/rect_down.png
index 4934678d..4934678d 100644..100755
--- a/images/tools/rect_down.png
+++ b/images/tools/rect_down.png
diff --git a/images/tools/rect_up.png b/images/tools/rect_up.png
index a19b0c53..a19b0c53 100644..100755
--- a/images/tools/rect_up.png
+++ b/images/tools/rect_up.png
diff --git a/images/tools/selection_down.png b/images/tools/selection_down.png
index c9a759b7..c9a759b7 100644..100755
--- a/images/tools/selection_down.png
+++ b/images/tools/selection_down.png
diff --git a/images/tools/selection_up.png b/images/tools/selection_up.png
index fb1c5687..fb1c5687 100644..100755
--- a/images/tools/selection_up.png
+++ b/images/tools/selection_up.png
diff --git a/images/tools/sprite-toolbar-3d.png b/images/tools/sprite-toolbar-3d.png
index d4746064..d4746064 100644..100755
--- a/images/tools/sprite-toolbar-3d.png
+++ b/images/tools/sprite-toolbar-3d.png
diff --git a/images/tools/sprite-toolbar-tag.png b/images/tools/sprite-toolbar-tag.png
index 69b13ec3..69b13ec3 100644..100755
--- a/images/tools/sprite-toolbar-tag.png
+++ b/images/tools/sprite-toolbar-tag.png
diff --git a/images/tools/subselect_down.png b/images/tools/subselect_down.png
index c306cc85..c306cc85 100644..100755
--- a/images/tools/subselect_down.png
+++ b/images/tools/subselect_down.png
diff --git a/images/tools/subselect_up.png b/images/tools/subselect_up.png
index 1964e03f..1964e03f 100644..100755
--- a/images/tools/subselect_up.png
+++ b/images/tools/subselect_up.png
diff --git a/images/tools/tag_down.png b/images/tools/tag_down.png
index e1ca61cc..e1ca61cc 100644..100755
--- a/images/tools/tag_down.png
+++ b/images/tools/tag_down.png
diff --git a/images/tools/tag_up.png b/images/tools/tag_up.png
index c6b71331..c6b71331 100644..100755
--- a/images/tools/tag_up.png
+++ b/images/tools/tag_up.png
diff --git a/images/tools/text_down.png b/images/tools/text_down.png
index a7b43e30..a7b43e30 100644..100755
--- a/images/tools/text_down.png
+++ b/images/tools/text_down.png
diff --git a/images/tools/text_up.png b/images/tools/text_up.png
index b5c1e3d2..b5c1e3d2 100644..100755
--- a/images/tools/text_up.png
+++ b/images/tools/text_up.png
diff --git a/images/tools/trans_down.png b/images/tools/trans_down.png
index 9a35e338..9a35e338 100644..100755
--- a/images/tools/trans_down.png
+++ b/images/tools/trans_down.png
diff --git a/images/tools/trans_up.png b/images/tools/trans_up.png
index 0b8c5560..0b8c5560 100644..100755
--- a/images/tools/trans_up.png
+++ b/images/tools/trans_up.png
diff --git a/images/tools/zoom_down.png b/images/tools/zoom_down.png
index ef6428b2..ef6428b2 100644..100755
--- a/images/tools/zoom_down.png
+++ b/images/tools/zoom_down.png
diff --git a/images/tools/zoom_up.png b/images/tools/zoom_up.png
index 8f56ddd0..8f56ddd0 100644..100755
--- a/images/tools/zoom_up.png
+++ b/images/tools/zoom_up.png