office-gobmx/desktop/win32/source
Jan Holesovsky ca39c0ee5f Merge commit 'libreoffice-3.4.0.2'
Conflicts:
	basic/source/app/app.cxx
	basic/source/runtime/iosys.cxx
	desktop/unx/source/start.c
	sfx2/source/appl/appdata.cxx
	sfx2/source/appl/appinit.cxx
	sfx2/source/inc/appdata.hxx
	svx/AllLangResTarget_svx.mk
	sysui/desktop/productversion.mk
	sysui/desktop/share/makefile.mk
2011-05-31 10:45:50 +02:00
..
applauncher drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
guiloader drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
guistdio drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
officeloader drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
QuickStart Merge commit 'ooo/DEV300_m103' 2011-03-23 16:59:26 +01:00
rebase drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
setup Merge commit 'libreoffice-3.4.0.2' 2011-05-31 10:45:50 +02:00
extendloaderenvironment.cxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
extendloaderenvironment.hxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
lwrapa.cxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
lwrapw.cxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
main.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
makefile.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
rwrapa.cxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
rwrapw.cxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
sowrapper.cxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
unoinfo.cxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
wrapper.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
wrappera.cxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
wrapperw.cxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00