Jan Holesovsky 79345f9ca0 Merge remote branch 'origin/libreoffice-3-3' ...

Conflicts:
	default_images/res/odb_32_hc.png
	default_images/res/odf_32_hc.png
	default_images/res/odg_32_hc.png
	default_images/res/odp_32_hc.png
	default_images/res/ods_32_hc.png
	default_images/res/odt_32_hc.png

2011-02-07 23:59:09 +01:00

260 B

16x16px

Raw History