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

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 4d324a3c..4d324a3c 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 28a3d5fc..28a3d5fc 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 7e0610d5..7e0610d5 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 9d9e40b6..9d9e40b6 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 3d3cde40..3d3cde40 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 8b7a50f3..8b7a50f3 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 40d127fc..40d127fc 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 8351c194..8351c194 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 36d429c8..36d429c8 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 c930f971..c930f971 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 1e5652b9..1e5652b9 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 74e91f14..74e91f14 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 a5d48703..a5d48703 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 6c757c34..6c757c34 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 beeb8bbe..beeb8bbe 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 bd60c362..bd60c362 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 c83993ef..c83993ef 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 bbab2b32..bbab2b32 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 4edd42e0..4edd42e0 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 3be93f08..3be93f08 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 2d95138f..2d95138f 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 5f76957f..5f76957f 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 6d4cc397..6d4cc397 100644
--- a/default_images/vcl/source/src/splvpin.png
+++ b/default_images/vcl/res/splvpin.png