diff options
| author | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
| commit | 13ae9dea8a9da1eb59dc561e62515cdebe3052e4 (patch) | |
| tree | 76682a0244b48fb219058b38b54b122eaaee0147 /slideshow/util | |
| parent | 9e3b989dddfef591eb697be509c9a0113c7d148a (diff) | |
| parent | bcdb702df7ee74fc1bb4adf9372985d7036ec457 (diff) | |
sb118: merged in DEV300_m72
Diffstat (limited to 'slideshow/util')
| -rw-r--r-- | slideshow/util/makefile.mk | 8 | ||||
| -rw-r--r-- | slideshow/util/makefile.pmk | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk index adde1895f52a..def425b60469 100644 --- a/slideshow/util/makefile.mk +++ b/slideshow/util/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -67,7 +63,7 @@ SHL1STDLIBS= $(TOOLSLIB) \ $(CANVASTOOLSLIB) \ $(CPPCANVASLIB) \ $(UNOTOOLSLIB) \ - $(GOODIESLIB) \ + $(SVTOOLLIB) \ $(AVMEDIALIB) SHL1IMPLIB=i$(TARGET) diff --git a/slideshow/util/makefile.pmk b/slideshow/util/makefile.pmk index 362e7f862a71..53724522d5e8 100644 --- a/slideshow/util/makefile.pmk +++ b/slideshow/util/makefile.pmk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.pmk,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |