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
..
doc/layout	Remove ChangeLog file (and this one)	2011-03-22 19:05:51 +01:00
inc	Merge commit 'ooo/DEV300_m106' into libreoffice-3-4	2011-04-22 15:09:06 +02:00
prj	removing unoapi tests from build.lst as they are covered in gbuild	2011-03-26 15:26:19 +01:00
qa	fdo#35690: reenable toolkit.AccessibleStatusBarItem as it appears stable	2011-05-23 11:28:41 +02:00
source	Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui	2011-05-27 21:12:53 +02:00
src2xml	Merge commit 'ooo/DEV300_m101' into intm101	2011-03-11 14:24:23 +01:00
test/accessibility	Change <file>.toURL() to <file>.toURI().toURL()	2011-05-04 20:50:00 +02:00
uiconfig/layout	replace res/commandimagelist with cmd in toolkit	2011-05-20 19:09:51 +02:00
util	adapt the vba container controls that got dropped as part of master merge	2011-03-23 17:34:31 +00:00
workben	replace res/commandimagelist with cmd in toolkit	2011-05-20 19:09:51 +02:00
AllLangResTarget_tk.mk	Fix build, re-introduce include path for xthrobber.hrc	2011-03-18 18:08:34 +01:00
JunitTest_toolkit_unoapi.mk	cleanup of unoapi test	2011-03-27 16:54:11 +02:00
Library_tk.mk	link to the correct libraries on *BSD too	2011-04-05 12:02:20 +02:00
Makefile
Module_toolkit.mk
Package_inc.mk	Merge commit 'ooo/DEV300_m101' into intm101	2011-03-11 14:24:23 +01:00
Package_source.mk
Package_util.mk