Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
	default_images/vcl/res/closedochc.png
	default_images/vcl/res/collate_h.png
	default_images/vcl/res/msgbox_hc.png
	default_images/vcl/res/ncollate_h.png
	default_images/vcl/source/src/collate_h.png
	default_images/vcl/source/src/ncollate_h.png
	ooo_custom_images/oxygen/svtools/res/collate_h.png
	ooo_custom_images/oxygen/svtools/res/ncollate_h.png

23 files changed, 0 insertions, 0 deletions

diff --git a/default_images/vcl/source/src/check.png b/default_images/vcl/res/check.png
index 4d324a3c2b6f..4d324a3c2b6f 100644
--- a/default_images/vcl/source/src/check.png
+++ b/default_images/vcl/res/check.png
diff --git a/default_images/vcl/source/src/checkmac.png b/default_images/vcl/res/checkmac.png
index 28a3d5fc6051..28a3d5fc6051 100644
--- a/default_images/vcl/source/src/checkmac.png
+++ b/default_images/vcl/res/checkmac.png
diff --git a/default_images/vcl/source/src/checkmono.bmp b/default_images/vcl/res/checkmono.bmp
index 7e0610d5e9d8..7e0610d5e9d8 100644
--- a/default_images/vcl/source/src/checkmono.bmp
+++ b/default_images/vcl/res/checkmono.bmp
diff --git a/default_images/vcl/source/src/checkos2.png b/default_images/vcl/res/checkos2.png
index 9d9e40b68a00..9d9e40b68a00 100644
--- a/default_images/vcl/source/src/checkos2.png
+++ b/default_images/vcl/res/checkos2.png
diff --git a/default_images/vcl/source/src/checkunx.png b/default_images/vcl/res/checkunx.png
index 3d3cde40e683..3d3cde40e683 100644
--- a/default_images/vcl/source/src/checkunx.png
+++ b/default_images/vcl/res/checkunx.png
diff --git a/default_images/vcl/source/src/checkwin.png b/default_images/vcl/res/checkwin.png
index 8b7a50f30db3..8b7a50f30db3 100644
--- a/default_images/vcl/source/src/checkwin.png
+++ b/default_images/vcl/res/checkwin.png
diff --git a/default_images/vcl/source/src/closedoc.png b/default_images/vcl/res/closedoc.png
index 40d127fc3949..40d127fc3949 100644
--- a/default_images/vcl/source/src/closedoc.png
+++ b/default_images/vcl/res/closedoc.png
diff --git a/default_images/vcl/source/src/collate.png b/default_images/vcl/res/collate.png
index 8351c1946c72..8351c1946c72 100644
--- a/default_images/vcl/source/src/collate.png
+++ b/default_images/vcl/res/collate.png
diff --git a/default_images/vcl/source/src/msgbox.png b/default_images/vcl/res/msgbox.png
index 36d429c8fe36..36d429c8fe36 100644
--- a/default_images/vcl/source/src/msgbox.png
+++ b/default_images/vcl/res/msgbox.png
diff --git a/default_images/vcl/source/src/ncollate.png b/default_images/vcl/res/ncollate.png
index c930f9715985..c930f9715985 100644
--- a/default_images/vcl/source/src/ncollate.png
+++ b/default_images/vcl/res/ncollate.png
diff --git a/default_images/vcl/source/src/pin.png b/default_images/vcl/res/pin.png
index 1e5652b9bc69..1e5652b9bc69 100644
--- a/default_images/vcl/source/src/pin.png
+++ b/default_images/vcl/res/pin.png
diff --git a/default_images/vcl/source/src/radio.png b/default_images/vcl/res/radio.png
index 74e91f148b74..74e91f148b74 100644
--- a/default_images/vcl/source/src/radio.png
+++ b/default_images/vcl/res/radio.png
diff --git a/default_images/vcl/source/src/radiomac.png b/default_images/vcl/res/radiomac.png
index a5d48703a825..a5d48703a825 100644
--- a/default_images/vcl/source/src/radiomac.png
+++ b/default_images/vcl/res/radiomac.png
diff --git a/default_images/vcl/source/src/radiomono.bmp b/default_images/vcl/res/radiomono.bmp
index 6c757c34bac8..6c757c34bac8 100644
--- a/default_images/vcl/source/src/radiomono.bmp
+++ b/default_images/vcl/res/radiomono.bmp
diff --git a/default_images/vcl/source/src/radioos2.png b/default_images/vcl/res/radioos2.png
index beeb8bbe2789..beeb8bbe2789 100644
--- a/default_images/vcl/source/src/radioos2.png
+++ b/default_images/vcl/res/radioos2.png
diff --git a/default_images/vcl/source/src/radiounx.png b/default_images/vcl/res/radiounx.png
index bd60c362e8ab..bd60c362e8ab 100644
--- a/default_images/vcl/source/src/radiounx.png
+++ b/default_images/vcl/res/radiounx.png
diff --git a/default_images/vcl/source/src/radiowin.png b/default_images/vcl/res/radiowin.png
index c83993ef6f68..c83993ef6f68 100644
--- a/default_images/vcl/source/src/radiowin.png
+++ b/default_images/vcl/res/radiowin.png
diff --git a/default_images/vcl/source/src/scrbmp.png b/default_images/vcl/res/scrbmp.png
index bbab2b321292..bbab2b321292 100644
--- a/default_images/vcl/source/src/scrbmp.png
+++ b/default_images/vcl/res/scrbmp.png
diff --git a/default_images/vcl/source/src/scrmsk.png b/default_images/vcl/res/scrmsk.png
index 4edd42e011a7..4edd42e011a7 100644
--- a/default_images/vcl/source/src/scrmsk.png
+++ b/default_images/vcl/res/scrmsk.png
diff --git a/default_images/vcl/source/src/splharw.png b/default_images/vcl/res/splharw.png
index 3be93f0823a4..3be93f0823a4 100644
--- a/default_images/vcl/source/src/splharw.png
+++ b/default_images/vcl/res/splharw.png
diff --git a/default_images/vcl/source/src/splhpin.png b/default_images/vcl/res/splhpin.png
index 2d95138f4d55..2d95138f4d55 100644
--- a/default_images/vcl/source/src/splhpin.png
+++ b/default_images/vcl/res/splhpin.png
diff --git a/default_images/vcl/source/src/splvarw.png b/default_images/vcl/res/splvarw.png
index 5f76957ff0aa..5f76957ff0aa 100644
--- a/default_images/vcl/source/src/splvarw.png
+++ b/default_images/vcl/res/splvarw.png
diff --git a/default_images/vcl/source/src/splvpin.png b/default_images/vcl/res/splvpin.png
index 6d4cc39748ed..6d4cc39748ed 100644
--- a/default_images/vcl/source/src/splvpin.png
+++ b/default_images/vcl/res/splvpin.png