office-gobmx/cairo
Jan Holesovsky 5f7158e265 Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
	boost/aliasing.patch
	boost/makefile.mk
	cairo/cairo/makefile.mk
	cairo/pixman/makefile.mk
	dictionaries/da_DK/README_th_da_DK.txt
	dictionaries/da_DK/description.xml
	dictionaries/da_DK/dictionaries.xcu
	dictionaries/da_DK/makefile.mk
	dictionaries/da_DK/th_da_DK.dat
	dictionaries/de_AT/th_de_AT_v2.idx
	dictionaries/de_CH/th_de_CH_v2.idx
	dictionaries/de_DE/COPYING
	dictionaries/de_DE/COPYING_GPLv2
	dictionaries/de_DE/COPYING_GPLv2.txt
	dictionaries/de_DE/README_extension_owner.txt
	dictionaries/de_DE/README_th_de_DE_v2.txt
	dictionaries/de_DE/makefile.mk
	dictionaries/de_DE/th_de_DE_v2.idx
	icu/makefile.mk
	moz/makefile.mk
	python/makefile.mk
2011-03-09 10:38:32 +01:00
..
cairo Merge commit 'ooo/DEV300_m101' into intm101 2011-03-09 10:38:32 +01:00
pixman cairo-pixman-makefile-mk.diff: Build pixman as shared library on x86_64 too 2010-09-14 12:27:12 +02:00
prj cws l10ntools: #i107386# #i107993# #ii107992# #i107991# #i108587# Added some buildtypes , fix for broken localize_sl regarding UPDMINOREXT , pmladeks localize.pl ooo enforcer patch 2010-01-22 18:50:33 +01:00
cairo-1.8.0.patch CWS-TOOLING: integrate CWS cairocanvastext01 2009-05-18 12:01:49 +00:00
pixman-0.12.0.patch Don't build pixman/test to prevent build failure when wrong cairo is linked 2010-09-30 13:47:06 +02:00