diff options
author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /basctl/Module_basctl.mk | |
parent | 8e0d67bed54633d555a4601a5d79e2d5ba7ab2bb (diff) | |
parent | 3f899eae02eaad0b967de749fe09b869ba93ad6d (diff) |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'basctl/Module_basctl.mk')
-rw-r--r-- | basctl/Module_basctl.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 11cabbbbbde5..3542e2b461aa 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -39,6 +39,7 @@ endif $(eval $(call gb_Module_add_targets,basctl,\ Package_uiconfig \ + UI_basicide \ )) # vim: set noet sw=4 ts=4: |