Kaydet (Commit) dcd3e3e4 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

Merge commit 'ooo/DEV300_m101' into intm101

Conflicts:
	default_images/res/commandimagelist/lch_showannotations.png
	default_images/shared/spinner-16-06.png
	default_images/svx/res/cropmarkersACC.png
	default_images/svx/res/markersACC.png
	default_images/svx/source/svdraw/cropmarkersACC.png
	default_images/svx/source/svdraw/markersACC.png
	default_images/toolkit/source/awt/spinner03-32-hc_01.png
	default_images/toolkit/source/awt/spinner03-32-hc_02.png
	default_images/toolkit/source/awt/spinner03-32-hc_03.png
	default_images/toolkit/source/awt/spinner03-32-hc_04.png
	default_images/toolkit/source/awt/spinner03-32-hc_05.png
	default_images/toolkit/source/awt/spinner03-32-hc_06.png
	default_images/toolkit/source/awt/spinner03-32-hc_07.png
	default_images/toolkit/source/awt/spinner03-32-hc_08.png
	default_images/toolkit/source/awt/spinner03-32-hc_09.png
	default_images/toolkit/source/awt/spinner03-32-hc_10.png
	default_images/toolkit/source/awt/spinner03-32-hc_11.png
	default_images/toolkit/source/awt/spinner03-32-hc_12.png
	default_images/toolkit/tk/spinner03-32-hc_01.png
	default_images/toolkit/tk/spinner03-32-hc_02.png
	default_images/toolkit/tk/spinner03-32-hc_03.png
	default_images/toolkit/tk/spinner03-32-hc_04.png
	default_images/toolkit/tk/spinner03-32-hc_05.png
	default_images/toolkit/tk/spinner03-32-hc_06.png
	default_images/toolkit/tk/spinner03-32-hc_07.png
	default_images/toolkit/tk/spinner03-32-hc_08.png
	default_images/toolkit/tk/spinner03-32-hc_09.png
	default_images/toolkit/tk/spinner03-32-hc_10.png
	default_images/toolkit/tk/spinner03-32-hc_11.png
	default_images/toolkit/tk/spinner03-32-hc_12.png
	ooo_custom_images/oxygen/svx/source/svdraw/cropmarkersACC.png
	ooo_custom_images/oxygen/svx/source/svdraw/markersACC.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_01.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_02.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_03.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_04.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_05.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_06.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_07.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_08.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_09.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_10.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_11.png
	ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_12.png
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment