strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/toolkit
History
Jan Holesovsky 932fb7b958 Merge commit 'ooo/DEV300_m103' 
Conflicts:
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	dtrans/source/win32/dtobj/XTDataObject.cxx
	dtrans/source/win32/dtobj/XTDataObject.hxx
	sot/source/sdstor/stgio.cxx
	tools/source/debug/debug.cxx
	vcl/source/gdi/jobset.cxx
	vcl/unx/kde4/KDEData.cxx
	vcl/unx/kde4/KDEData.hxx
	vcl/unx/kde4/KDESalDisplay.cxx
	vcl/unx/kde4/KDESalFrame.cxx
	vcl/unx/kde4/KDESalFrame.hxx
	vcl/unx/kde4/KDESalGraphics.cxx
	vcl/unx/kde4/KDESalGraphics.hxx
	vcl/unx/kde4/KDESalInstance.cxx
	vcl/unx/kde4/KDESalInstance.hxx
	vcl/unx/kde4/KDEXLib.cxx
	vcl/unx/kde4/VCLKDEApplication.cxx
	vcl/unx/kde4/VCLKDEApplication.hxx
2011-03-23 16:59:33 +01:00
..
doc/layout
inc Merge commit 'ooo/DEV300_m103' 2011-03-23 16:59:33 +01:00
prj gridsort: post-rebase fixes 2011-02-15 12:12:43 +01:00
qa Merge commit 'ooo/DEV300_m103' 2011-03-23 16:59:33 +01:00
source Merge commit 'ooo/DEV300_m103' 2011-03-23 16:59:33 +01:00
src2xml Merge commit 'ooo/DEV300_m101' into intm101 2011-03-11 14:24:23 +01:00
test/accessibility gnumake2: removing old dmake file in migrated modules 2010-11-19 21:45:41 +01:00
uiconfig/layout gnumake2: removing old dmake file in migrated modules 2010-11-19 21:45:41 +01:00
util gridsort: pulled and merged DEV300_m100 2011-02-14 23:00:48 +01:00
workben Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:55:08 +01:00
AllLangResTarget_tk.mk Fix build, re-introduce include path for xthrobber.hrc 2011-03-18 18:08:34 +01:00
JunitTest_toolkit_unoapi.mk gnumake3: #i116390# finishing support for Junittests in gbuild 2011-01-19 14:16:46 +01:00
Library_tk.mk Use realpath to avoid -I options containing symlinks on Cygwin 2011-03-16 20:15:19 +02:00
Makefile gnumake2: updated license headers 2010-11-17 14:33:18 +01:00
Module_toolkit.mk CWS gnumake3: fix license headers 2011-01-25 18:19:55 +01:00
Package_inc.mk Merge commit 'ooo/DEV300_m101' into intm101 2011-03-11 14:24:23 +01:00
Package_source.mk CWS gnumake3: fix license headers 2011-01-25 18:19:55 +01:00
Package_util.mk CWS gnumake3: fix license headers 2011-01-25 18:19:55 +01:00