diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-01-06 21:09:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-06 21:09:13 +0100 |
| commit | 23dd856d3c70a63dd47ae2a09a75833267296432 (patch) | |
| tree | 3ed426d983d5a46cc48dc1ee873ac5627b867f05 /RepositoryModule_ooo.mk | |
| parent | 5106b38a9cc64677b3fa4a0aea7450560775e78e (diff) | |
| parent | 7e5b321535977ccddc6703c0ad4e5d25af797654 (diff) | |
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
Diffstat (limited to 'RepositoryModule_ooo.mk')
| -rw-r--r-- | RepositoryModule_ooo.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index d44e041e1a62..f89b39321d89 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ dtrans \ editeng \ eventattacher \ + extensions \ fileaccess \ filter \ forms \ |