Michael Stahl 23dd856d3c Merge branch 'feature/gbuild_extensions' ...

Conflicts:
	extensions/source/ole/servreg.cxx
	extensions/source/plugin/util/makefile.mk
	postprocess/packcomponents/makefile.mk
	postprocess/prj/build.lst
	tail_build/prj/build.lst

2012-01-06 21:09:13 +01:00

..

abpilot

Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions

2011-12-24 09:44:24 -05:00

activex

extensions: convert activex to gbuild

2011-12-18 01:28:13 +01:00

bibliography

Merge branch 'feature/gbuild_extensions'

2012-01-06 21:09:13 +01:00

config/ldap

Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions

2011-12-24 09:44:24 -05:00

dbpilots

Merge branch 'feature/gbuild_extensions'

2012-01-06 21:09:13 +01:00

inc

ByteString->rtl::OString

2011-11-06 22:38:27 +00:00

logging

Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions

2011-12-24 09:44:24 -05:00

macosx/spotlight

Merge branch 'feature/gbuild_extensions'

2012-01-06 21:09:13 +01:00

nsplugin/source

Merge branch 'feature/gbuild_extensions'

2012-01-06 21:09:13 +01:00

ole

Merge branch 'feature/gbuild_extensions'

2012-01-06 21:09:13 +01:00

plugin

Merge branch 'feature/gbuild_extensions'

2012-01-06 21:09:13 +01:00

propctrlr

Merge branch 'feature/gbuild_extensions'

2012-01-06 21:09:13 +01:00

resource

extensions: convert resource, xmlextract to gbuild

2011-12-18 00:47:43 +01:00

scanner

Merge branch 'feature/gbuild_extensions'

2012-01-06 21:09:13 +01:00

update

Merge branch 'feature/gbuild_extensions'

2012-01-06 21:09:13 +01:00

xmlextract

Merge branch 'feature/gbuild_extensions'

2012-01-06 21:09:13 +01:00