diff options
author | Andras Timar <atimar@suse.com> | 2012-09-28 16:57:02 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-09-28 16:57:02 +0200 |
commit | dbac379f77a034f10e62e607258fcbafad41b7ab (patch) | |
tree | 38c9db63bb991d8ff0ca8060274f8c6aaf92e3c9 /l10ntools/Module_l10ntools.mk | |
parent | 822ac662c758916af546a293a408ee6fbb9cfe7e (diff) | |
parent | 8b97644bab0e9106b798a5b8969aa796e558ef3f (diff) |
Merge branch 'master' into feature/killsdf
Conflicts:
l10ntools/Module_l10ntools.mk
l10ntools/source/merge.cxx
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/ExtensionTarget.mk
solenv/gbuild/InstallModuleTarget.mk
solenv/gbuild/TargetLocations.mk
Diffstat (limited to 'l10ntools/Module_l10ntools.mk')
-rw-r--r-- | l10ntools/Module_l10ntools.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index fb2a3b3289e5..4b1d64d80e12 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -33,14 +33,12 @@ $(eval $(call gb_Module_add_targets,l10ntools,\ Executable_ulfex \ Executable_gsicheck \ Executable_cfgex \ + Executable_uiex \ Executable_xrmex \ Executable_localize \ Executable_transex3 \ - Executable_helpindexer \ - Executable_helplinker \ Executable_renewpo \ StaticLibrary_transex \ - Library_helplinker \ Package_inc \ Package_scripts \ Package_ulfconv \ |