strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/svtools/source
History
Jan Holesovsky 4fdd55226d Merge remote-tracking branch 'origin/integration/dev300_m101' 
Conflicts:
	comphelper/source/misc/servicedecl.cxx
	i18npool/source/breakiterator/breakiteratorImpl.cxx
	l10ntools/scripts/localize.pl
	svl/source/items/itemset.cxx
	svl/source/memtools/svarray.cxx
	svl/source/numbers/zformat.cxx
	svtools/source/brwbox/brwbox1.cxx
	tools/source/stream/strmwnt.cxx
	vcl/inc/vcl/graphite_adaptors.hxx
	vcl/inc/vcl/graphite_layout.hxx
	vcl/inc/vcl/graphite_serverfont.hxx
	vcl/source/control/imgctrl.cxx
	vcl/source/gdi/outdev.cxx
	vcl/source/gdi/outdev3.cxx
	vcl/source/glyphs/gcach_ftyp.cxx
	vcl/source/glyphs/graphite_adaptors.cxx
	vcl/source/glyphs/graphite_layout.cxx
	vcl/source/window/winproc.cxx
	vcl/unx/source/fontmanager/fontconfig.cxx
2011-03-18 15:55:08 +01:00
..
brwbox Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
config Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
contnr Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
control Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
dialogs Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
edit fix up merging issues, so it compiles 2011-03-11 18:08:25 +00:00
filter.vcl Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
graphic Merge commit 'ooo/DEV300_m101' into intm101 2011-03-11 14:24:23 +01:00
hatchwindow fix up merging issues, so it compiles 2011-03-11 18:08:25 +00:00
inc Merge commit 'ooo/DEV300_m101' into intm101 2011-03-11 14:24:23 +01:00
java Merge commit 'ooo/DEV300_m101' into intm101 2011-03-11 14:24:23 +01:00
misc export filterutils.hxx (andd compile filterutils.cxx) 2011-03-13 05:35:10 -05:00
plugapp Merge commit 'ooo/DEV300_m101' into intm101 2011-03-11 14:24:23 +01:00
productregistration Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
svhtml Merge commit 'ooo/DEV300_m101' into intm101 2011-03-11 14:24:23 +01:00
svrtf Merge commit 'ooo/DEV300_m101' into intm101 2011-03-11 14:24:23 +01:00
table Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
toolpanel Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
uno Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
urlobj Merge commit 'ooo/DEV300_m101' into intm101 2011-03-11 14:24:23 +01:00