office-gobmx/vcl
Jan Holesovsky 66bf06edd0 Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui
Conflicts:
	vcl/source/control/makefile.mk
	vcl/unx/generic/printer/ppdparser.cxx
2011-05-27 21:12:53 +02:00
..
aqua/source Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:47:31 +02:00
inc Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui 2011-05-27 21:12:53 +02:00
prj Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:47:31 +02:00
qa/complex drop bogus executable flag from odf files 2011-03-29 21:43:58 +01:00
source Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui 2011-05-27 21:12:53 +02:00
test Drop OS2 2011-05-21 17:00:45 +03:00
unx Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui 2011-05-27 21:12:53 +02:00
util Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:47:31 +02:00
win/source Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:47:31 +02:00
workben Merge commit 'ooo/DEV300_m101' into intm101 2011-03-11 14:24:23 +01:00
AllLangResTarget_vcl.mk
Library_desktop_detector.mk Make vcl building. 2011-04-29 19:19:30 +02:00
Library_vcl.mk Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:47:31 +02:00
Library_vclplug_gen.mk Make vcl building. 2011-04-29 19:19:30 +02:00
Library_vclplug_gtk.mk Make vcl building. 2011-04-29 19:19:30 +02:00
Library_vclplug_kde.mk Make vcl building. 2011-04-29 19:19:30 +02:00
Library_vclplug_kde4.mk Make vcl building. 2011-04-29 19:19:30 +02:00
Library_vclplug_svp.mk Make vcl building. 2011-04-29 19:19:30 +02:00
Makefile
Module_vcl.mk Make vcl building. 2011-04-29 19:19:30 +02:00
Package_afmhash.mk Make vcl building. 2011-04-29 19:19:30 +02:00
Package_inc.mk masterfix DEV300: #i10000# build fixes 2011-03-30 18:52:07 +02:00
Package_osx.mk Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 2011-04-22 15:09:06 +02:00
StaticLibrary_vclmain.mk Make vcl building. 2011-04-29 19:19:30 +02:00
vcl.macosx.component CWS-TOOLING: integrate CWS vcl2gnumake 2011-03-29 16:29:12 +02:00
vcl.unx.component CWS-TOOLING: integrate CWS vcl2gnumake 2011-03-29 16:29:12 +02:00
vcl.windows.component CWS-TOOLING: integrate CWS vcl2gnumake 2011-03-29 16:29:12 +02:00
WinResTarget_vcl.mk vcl2gnumake: #i116588# add: windows native resource files, cleanup (thanks hjs !) 2011-03-23 17:32:53 +01:00