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/Zip_launcher.mk | |
| 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/Zip_launcher.mk')
| -rw-r--r-- | wizards/Zip_launcher.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/wizards/Zip_launcher.mk b/wizards/Zip_launcher.mk index 20efead75f84..091b4a45e81f 100644 --- a/wizards/Zip_launcher.mk +++ b/wizards/Zip_launcher.mk @@ -24,13 +24,10 @@ # for a copy of the LGPLv3 License. # #************************************************************************* - $(eval $(call gb_Zip_Zip,basicsrvlauncher,$(SRCDIR)/wizards/source/launcher)) - $(eval $(call gb_Zip_add_files,basicsrvlauncher,\ dialog.xlb \ DicOOo.xba \ script.xlb \ )) - # vim: set noet sw=4 ts=4: |