Jan Holesovsky 66bf06edd0 Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui ... Conflicts: vcl/source/control/makefile.mk vcl/unx/generic/printer/ppdparser.cxx		2011-05-27 21:12:53 +02:00
..
awt	Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui	2011-05-27 21:12:53 +02:00
controls	Merge remote-tracking branch 'origin/integration/dev300_m106'	2011-05-27 20:47:31 +02:00
helper	Merge remote-tracking branch 'origin/integration/dev300_m106'	2011-05-27 20:47:31 +02:00
layout	Remove unused DBG_ERROR macros	2011-03-18 22:29:15 +01:00