Commit graph

4 commits

Author SHA1 Message Date
Michael Meeks
69a51d2bb6 re-base on ALv2 code. 2012-06-26 11:33:02 +01:00
Norbert Thiebaud
07b3d083b4 TDE integration
Change-Id: I6f468005c8d8d99d9251a9c4fe4629b98bc4aa5e
2012-05-14 20:09:41 -05:00
Jan Holesovsky
83380a7805 Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
	cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
	l10ntools/scripts/localize.pl
	l10ntools/source/directory.cxx
	l10ntools/source/srciter.cxx
	padmin/Executable_spadmin.bin.mk
	padmin/Library_spa.mk
	svtools/inc/svtools/filter.hxx
	svtools/inc/svtools/grfmgr.hxx
	svtools/source/filter/filter.cxx
	svtools/source/filter/filter2.cxx
	svtools/source/filter/wmf/emfwr.cxx
	svtools/source/filter/wmf/enhwmf.cxx
	svtools/source/filter/wmf/winmtf.cxx
	svtools/source/filter/wmf/winmtf.hxx
	svtools/source/filter/wmf/winwmf.cxx
	svtools/source/filter/wmf/wmfwr.cxx
	svtools/source/graphic/grfmgr.cxx
	svtools/source/graphic/grfmgr2.cxx
	toolkit/source/controls/controlmodelcontainerbase.cxx
	toolkit/source/controls/unocontrol.cxx
	toolkit/source/helper/formpdfexport.cxx
	toolkit/source/helper/unowrapper.cxx
	vcl/Package_osx.mk
	vcl/aqua/source/app/salinst.cxx
	vcl/aqua/source/app/salsys.cxx
	vcl/aqua/source/dtrans/aqua_service.cxx
	vcl/aqua/source/dtrans/test_aquacb.cxx
	vcl/aqua/source/res/makefile.mk
	vcl/aqua/source/window/salframe.cxx
	vcl/aqua/source/window/salframeview.mm
	vcl/inc/aqua/salgdi.h
	vcl/inc/aqua/salinst.h
	vcl/inc/graphite_adaptors.hxx
	vcl/inc/graphite_cache.hxx
	vcl/inc/graphite_serverfont.hxx
	vcl/inc/impprn.hxx
	vcl/inc/svdata.hxx
	vcl/inc/unx/i18n_status.hxx
	vcl/inc/unx/saldata.hxx
	vcl/inc/unx/salfont.h
	vcl/inc/unx/salinst.h
	vcl/inc/unx/salprn.h
	vcl/inc/unx/salsys.h
	vcl/inc/unx/sm.hxx
	vcl/inc/vcl/gdimtf.hxx
	vcl/inc/vcl/graph.hxx
	vcl/inc/vcl/outdev.hxx
	vcl/inc/vcl/polyscan.hxx
	vcl/inc/vcl/svcompat.hxx
	vcl/inc/vcl/svgread.hxx
	vcl/inc/vcl/unobrok.hxx
	vcl/inc/win/salgdi.h
	vcl/inc/win/wincomp.hxx
	vcl/prj/d.lst
	vcl/source/app/dbggui.cxx
	vcl/source/app/idlemgr.cxx
	vcl/source/app/makefile.mk
	vcl/source/app/settings.cxx
	vcl/source/app/sound.cxx
	vcl/source/app/stdtext.cxx
	vcl/source/app/svapp.cxx
	vcl/source/app/svdata.cxx
	vcl/source/app/svmain.cxx
	vcl/source/app/timer.cxx
	vcl/source/app/unohelp.cxx
	vcl/source/components/dtranscomp.cxx
	vcl/source/control/button.cxx
	vcl/source/control/combobox.cxx
	vcl/source/control/ctrl.cxx
	vcl/source/control/edit.cxx
	vcl/source/control/field2.cxx
	vcl/source/control/ilstbox.cxx
	vcl/source/gdi/bitmap.cxx
	vcl/source/gdi/bitmapex.cxx
	vcl/source/gdi/cvtgrf.cxx
	vcl/source/gdi/font.cxx
	vcl/source/gdi/image.cxx
	vcl/source/gdi/imagerepository.cxx
	vcl/source/gdi/impbmp.cxx
	vcl/source/gdi/impgraph.cxx
	vcl/source/gdi/impimagetree.cxx
	vcl/source/gdi/jobset.cxx
	vcl/source/gdi/makefile.mk
	vcl/source/gdi/metaact.cxx
	vcl/source/gdi/outdev.cxx
	vcl/source/gdi/outdev2.cxx
	vcl/source/gdi/outdev5.cxx
	vcl/source/gdi/outdev6.cxx
	vcl/source/gdi/outmap.cxx
	vcl/source/gdi/polyscan.cxx
	vcl/source/gdi/print.cxx
	vcl/source/gdi/print2.cxx
	vcl/source/gdi/region.cxx
	vcl/source/gdi/salgdilayout.cxx
	vcl/source/gdi/sallayout.cxx
	vcl/source/gdi/svcompat.cxx
	vcl/source/gdi/virdev.cxx
	vcl/source/glyphs/gcach_ftyp.cxx
	vcl/source/glyphs/gcach_vdev.cxx
	vcl/source/glyphs/gcach_vdev.hxx
	vcl/source/glyphs/graphite_adaptors.cxx
	vcl/source/glyphs/graphite_cache.cxx
	vcl/source/glyphs/graphite_layout.cxx
	vcl/source/glyphs/graphite_serverfont.cxx
	vcl/source/glyphs/graphite_textsrc.hxx
	vcl/source/glyphs/makefile.mk
	vcl/source/src/makefile.mk
	vcl/source/window/accel.cxx
	vcl/source/window/brdwin.cxx
	vcl/source/window/btndlg.cxx
	vcl/source/window/dialog.cxx
	vcl/source/window/dndevdis.cxx
	vcl/source/window/dockmgr.cxx
	vcl/source/window/dockwin.cxx
	vcl/source/window/floatwin.cxx
	vcl/source/window/introwin.cxx
	vcl/source/window/keycod.cxx
	vcl/source/window/menu.cxx
	vcl/source/window/msgbox.cxx
	vcl/source/window/scrwnd.cxx
	vcl/source/window/split.cxx
	vcl/source/window/splitwin.cxx
	vcl/source/window/status.cxx
	vcl/source/window/syswin.cxx
	vcl/source/window/tabpage.cxx
	vcl/source/window/toolbox.cxx
	vcl/source/window/toolbox2.cxx
	vcl/source/window/window.cxx
	vcl/source/window/window2.cxx
	vcl/source/window/winproc.cxx
	vcl/source/window/wrkwin.cxx
	vcl/unx/generic/app/i18n_cb.cxx
	vcl/unx/generic/app/i18n_ic.cxx
	vcl/unx/generic/app/saldata.cxx
	vcl/unx/generic/app/saldisp.cxx
	vcl/unx/generic/app/salinst.cxx
	vcl/unx/generic/app/wmadaptor.cxx
	vcl/unx/generic/fontmanager/afm_hash.cpp
	vcl/unx/generic/gdi/salbmp.cxx
	vcl/unx/generic/gdi/salgdi3.cxx
	vcl/unx/generic/gdi/xrender_peer.cxx
	vcl/unx/generic/window/salframe.cxx
	vcl/unx/generic/window/salobj.cxx
	vcl/unx/gtk/a11y/makefile.mk
	vcl/unx/gtk/app/gtksys.cxx
	vcl/unx/gtk/app/makefile.mk
	vcl/unx/gtk/window/gtkframe.cxx
	vcl/unx/gtk/window/gtkobject.cxx
	vcl/unx/headless/svpinst.cxx
	vcl/unx/headless/svpinst.hxx
	vcl/unx/headless/svpprn.hxx
	vcl/unx/kde/kdedata.cxx
	vcl/unx/kde/salnativewidgets-kde.cxx
	vcl/unx/kde4/KDESalDisplay.hxx
	vcl/unx/kde4/KDEXLib.cxx
	vcl/unx/kde4/KDEXLib.hxx
	vcl/unx/kde4/VCLKDEApplication.cxx
	vcl/unx/kde4/makefile.mk
	vcl/unx/source/app/makefile.mk
	vcl/unx/source/fontmanager/makefile.mk
	vcl/unx/source/gdi/makefile.mk
	vcl/unx/source/inc/salcursors.h
	vcl/util/linksvp/makefile.mk
	vcl/win/source/app/saldata.cxx
	vcl/win/source/app/salinst.cxx
	vcl/win/source/app/salshl.cxx
	vcl/win/source/gdi/makefile.mk
	vcl/win/source/gdi/salbmp.cxx
	vcl/win/source/gdi/salgdi.cxx
	vcl/win/source/gdi/salgdi2.cxx
	vcl/win/source/gdi/salgdi3.cxx
	vcl/win/source/gdi/salgdi_gdiplus.cxx
	vcl/win/source/gdi/salprn.cxx
	vcl/win/source/gdi/salvd.cxx
	vcl/win/source/gdi/winlayout.cxx
	vcl/win/source/window/salframe.cxx
	vcl/win/source/window/salmenu.cxx
	vcl/win/source/window/salobj.cxx
2011-04-22 15:09:06 +02:00
Philipp Lohmann [pl]
bb3127a8c0 vcl2gnumake: #i116588# move vcl to gbuild (step 1, linux) 2011-01-25 17:35:20 +01:00