strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS os35 (1.79.12); FILE MERGED

Browse source 
2004/07/20 10:59:37 dr 1.79.12.5: #i10000# merge error
2004/07/16 13:58:45 dr 1.79.12.4: #i10000# merge error
2004/07/15 15:44:28 dr 1.79.12.3: RESYNC: (1.79-1.81); FILE MERGED
2004/07/14 15:07:34 os 1.79.12.2: #i29875# formatmenucontroller removed
2004/07/12 16:18:57 cd 1.79.12.1: #i31348# New popup menu controller for recent file list
This commit is contained in:
Kurt Zenker 2004-08-02 12:17:41 +00:00
parent 096e7f72a6
commit c657ff0186
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
framework/util/makefile.mk
View file

@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.81 $ # $Revision: 1.82 $
# #
# last change: $Author: obo $ $Date: 2004-07-07 13:43:33 $ # last change: $Author: kz $ $Date: 2004-08-02 13:17:41 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@ -274,7 +274,6 @@ SHL4OBJS= \
$(SLO)$/popupmenucontrollerbase.obj \ $(SLO)$/popupmenucontrollerbase.obj \
$(SLO)$/fontmenucontroller.obj \ $(SLO)$/fontmenucontroller.obj \
$(SLO)$/fontsizemenucontroller.obj \ $(SLO)$/fontsizemenucontroller.obj \
$(SLO)$/formatmenucontroller.obj \
$(SLO)$/objectmenucontroller.obj \ $(SLO)$/objectmenucontroller.obj \
$(SLO)$/headermenucontroller.obj \ $(SLO)$/headermenucontroller.obj \
$(SLO)$/footermenucontroller.obj \ $(SLO)$/footermenucontroller.obj \
@ -307,7 +306,8 @@ SHL4OBJS= \
$(SLO)$/toolbarcontrollerfactory.obj\ $(SLO)$/toolbarcontrollerfactory.obj\
$(SLO)$/moduleimagemanager.obj \ $(SLO)$/moduleimagemanager.obj \
$(SLO)$/imagemanager.obj \ $(SLO)$/imagemanager.obj \
$(SLO)$/graphicnameaccess.obj $(SLO)$/graphicnameaccess.obj \
$(SLO)$/recentfilesmenucontroller.obj
SHL4STDLIBS= \ SHL4STDLIBS= \
$(FWILIB) \ $(FWILIB) \