Thomas Arnhold 9478864ad2 Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/writer ... Conflicts: sw/source/core/layout/ssfrm.cxx		2011-01-18 16:40:38 +01:00
..
inc	Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/writer	2011-01-18 16:40:38 +01:00
prj	cppcheck: always build these tests now	2010-12-20 14:44:56 +00:00
qa	fix warning	2011-01-11 14:33:33 +00:00
sdi	Integrated the visual formula editor patch	2010-10-01 23:08:54 +02:00
source	Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/writer	2011-01-18 16:40:38 +01:00
uiconfig/smath	Put show credits entry into all app ui configs	2010-11-25 23:14:47 +01:00
util	sb118: merged in DEV300_m72	2010-02-25 12:46:45 +01:00
workben	Updating todo-file for visual editor, and adding graph dump script	2010-10-28 23:59:35 +02:00
xml
visual-editor-todo	Clear 2 things from the visual formula editor todo list.	2010-11-24 12:19:51 +01:00