office-gobmx/scp2
Jan Holesovsky e3d5d7185d Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
	Makefile.in
	bootstrap.1
	configure.in
	solenv/inc/minor.mk
2011-06-17 13:44:18 +02:00
..
inc Some more w4w mentions gone 2011-06-14 12:13:46 +02:00
macros
prj Mark setup_native and l10ntools as DESKTOP 2011-06-16 21:47:33 +03:00
source Merge remote-tracking branch 'origin/libreoffice-3-4' 2011-06-17 13:44:18 +02:00
util Make the online update service configurable (via --enable-online-update). 2011-06-17 11:45:12 +02:00