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/Jar_query.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/Jar_query.mk')
| -rw-r--r-- | wizards/Jar_query.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk index a915c40069af..2183238cadb3 100644 --- a/wizards/Jar_query.mk +++ b/wizards/Jar_query.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Jar_add_jars,query,\ $(OUTDIR)/bin/java_uno.jar \ $(OUTDIR)/bin/commonwizards.jar \ )) - $(eval $(call gb_Jar_set_manifest,query,$(SRCDIR)/wizards/com/sun/star/wizards/query/MANIFEST.MF)) $(eval $(call gb_Jar_set_packageroot,query,com)) |