Commit graph

2 commits

Author SHA1 Message Date
Jan Holesovsky
9b1243c858 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
2011-04-22 15:07:31 +02:00
Philipp Lohmann [pl]
e36eaeb472 vcl2gnumake: #i116588# move vcl to gbuild (step 3,linux,solaris,macos) 2011-01-26 19:18:52 +01:00