diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 19:33:52 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 19:33:52 +0000 |
| commit | cd7daee11de052d12517089743033b0a7f7a21da (patch) | |
| tree | c879f2750e569a8fd7fddf4fcc25894d5375e39e /sd/source | |
| parent | b2ea69cead430ba22bd859053eaaed492722ee6c (diff) | |
INTEGRATION: CWS presentationengine01 (1.10.10); FILE MERGED
2004/11/22 23:14:48 thb 1.10.10.9: #i10000# Resolving merge problems: removed duplicate line
2004/11/17 19:39:26 thb 1.10.10.8: RESYNC: (1.14-1.15); FILE MERGED
2004/09/02 14:49:58 cl 1.10.10.7: moved new slideshow to own folder
2004/08/25 16:32:49 cl 1.10.10.6: replaced old FuSlideShow with new SlideShow
2004/08/23 12:37:36 thb 1.10.10.5: RESYNC: (1.13-1.14); FILE MERGED
2004/08/03 19:50:34 thb 1.10.10.4: #110496# Added preliminary XSlideShow integration
2004/07/23 15:11:14 thb 1.10.10.3: RESYNC: (1.12-1.13); FILE MERGED
2004/07/07 01:37:48 thb 1.10.10.2: RESYNC: (1.10-1.12); FILE MERGED
2004/04/12 15:17:05 thb 1.10.10.1: #110496# Adaptions after canvas01 merge
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk index 3ba4d4abb530..482c565a3096 100644 --- a/sd/source/ui/view/makefile.mk +++ b/sd/source/ui/view/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: pjunck $ $Date: 2004-10-28 13:35:23 $ +# last change: $Author: rt $ $Date: 2004-11-26 20:33:51 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -83,6 +83,7 @@ EXCEPTIONSFILES= \ $(SLO)$/drviews8.obj \ $(SLO)$/drviewsa.obj \ $(SLO)$/outlnvsh.obj \ + $(SLO)$/presvish.obj \ $(SLO)$/slidvish.obj \ $(SLO)$/ObjectBarManager.obj @@ -126,12 +127,11 @@ SLOFILES = \ $(SLO)$/slidview.obj \ $(SLO)$/outlnvsh.obj \ $(SLO)$/outlnvs2.obj \ - $(SLO)$/presvish.obj \ $(SLO)$/prvwshll.obj \ + $(SLO)$/presvish.obj \ $(SLO)$/outlview.obj \ $(SLO)$/tabcontr.obj \ $(SLO)$/showview.obj \ - $(SLO)$/showwin.obj \ $(SLO)$/bmcache.obj \ $(SLO)$/drbezob.obj \ $(SLO)$/drglueob.obj \ |