diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
| commit | e2682561337c521f10fa2c87594c86c01b3c662a (patch) | |
| tree | a8cb220cf9888183c2de5edd3644597c63b67b9a /wizards/prj | |
| parent | 68f53efa2572acc661c8a75ee2ec09f87348aa65 (diff) | |
| parent | f9c2beb2cdb4ae448d22ae390c63159b88df9e9e (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
setup_native/prj/build.lst
setup_native/prj/d.lst
wizards/Jar_query.mk
wizards/Module_wizards.mk
wizards/Zip_launcher.mk
wizards/com/sun/star/wizards/report/makefile.mk
wizards/prj/build.lst
wizards/prj/d.lst
wizards/util/target.pmk
Diffstat (limited to 'wizards/prj')
| -rw-r--r-- | wizards/prj/build.lst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst index e4037a0021dd..2c2a8456d44b 100644 --- a/wizards/prj/build.lst +++ b/wizards/prj/build.lst @@ -1,2 +1,2 @@ -wz wizards : L10N:l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL +wz wizards : TRANSLATIONS:translations rsc javaunohelper unoil LIBXSLT:libxslt NULL wz wizards\prj nmake - all wz_prj NULL |