office-gobmx/slideshow
Rene Engelhard 0d23563871 Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
	slideshow/source/engine/color.cxx
2011-01-02 01:06:39 +01:00
..
inc add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
prj add this conditional 2010-12-22 16:07:20 +00:00
qa INTEGRATION: CWS presfixes12 (1.1.2); FILE ADDED 2007-07-17 13:33:10 +00:00
source Merge remote branch 'origin/libreoffice-3-3' 2011-01-02 01:06:39 +01:00
test RTL_CONSTASCII_USTRINGPARAM slideshow test 2010-12-15 07:47:09 +01:00
util sb118: merged in DEV300_m72 2010-02-25 12:46:45 +01:00
manifest.txt INTEGRATION: CWS presfixes12 (1.1.2); FILE ADDED 2007-07-17 13:32:44 +00:00