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
..
dummy_pkg_config	Add build files. Cairo module now feature complete.	2008-06-03 03:23:47 +00:00
makefile.mk	Merge commit 'ooo/DEV300_m101' into intm101	2011-03-09 10:38:32 +01:00