diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:54:52 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:54:52 +0200 |
| commit | 6f7b36ecd838fd3ed00cebb2973d3d2e66ae5ca5 (patch) | |
| tree | 1c21f92f10ec2b3811349b1920d3ad7710c9f20b /writerfilter/prj | |
| parent | Merge branch 'master' into feature/gnumake4 (diff) | |
| download | core-6f7b36ecd838fd3ed00cebb2973d3d2e66ae5ca5.tar.gz core-6f7b36ecd838fd3ed00cebb2973d3d2e66ae5ca5.zip | |
remove merge trash
Diffstat (limited to 'writerfilter/prj')
| -rw-r--r-- | writerfilter/prj/build.lst.orig | 6 | ||||
| -rwxr-xr-x | writerfilter/prj/makefile.mk.orig | 44 |
2 files changed, 0 insertions, 50 deletions
diff --git a/writerfilter/prj/build.lst.orig b/writerfilter/prj/build.lst.orig deleted file mode 100644 index ece3d79e99ef..000000000000 --- a/writerfilter/prj/build.lst.orig +++ /dev/null @@ -1,6 +0,0 @@ -wf writerfilter : soltools sal BOOST:boost cppu cppuhelper ucbhelper tools svx LIBXSLT:libxslt oox NULL -<<<<<<< HEAD -======= -wf writerfilter usr1 - all wf_mkout NULL ->>>>>>> master -wf writerfilter\prj nmake - all wf_prj NULL diff --git a/writerfilter/prj/makefile.mk.orig b/writerfilter/prj/makefile.mk.orig deleted file mode 100755 index df68ecd6e56a..000000000000 --- a/writerfilter/prj/makefile.mk.orig +++ /dev/null @@ -1,44 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. -TARGET=prj - -.INCLUDE : settings.mk - -.IF "$(VERBOSE)"!="" -VERBOSEFLAG := -.ELSE -VERBOSEFLAG := -s -.ENDIF - -all: -<<<<<<< HEAD - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) -======= - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog ->>>>>>> master |