• Jan Holesovsky's avatar
    Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 · 9b1243c8
    Jan Holesovsky yazdı
    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
    9b1243c8