INTEGRATION: CWS fwk66 (1.13.130); FILE MERGED

2007/06/04 11:22:03 cd 1.13.130.1: #i78020# Support merging to menu and toolbar for add-ons
This commit is contained in:
Ivo Hinkelmann 2007-07-10 14:12:01 +00:00
parent 199e5c8816
commit 4e15797f6b

View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.13 $
# $Revision: 1.14 $
#
# last change: $Author: ihi $ $Date: 2006-08-01 09:39:07 $
# last change: $Author: ihi $ $Date: 2007-07-10 15:12:01 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -83,7 +83,9 @@ SLOFILES= \
$(SLO)$/buttontoolbarcontroller.obj \
$(SLO)$/spinfieldtoolbarcontroller.obj \
$(SLO)$/edittoolbarcontroller.obj \
$(SLO)$/dropdownboxtoolbarcontroller.obj
$(SLO)$/dropdownboxtoolbarcontroller.obj \
$(SLO)$/menubarmerger.obj \
$(SLO)$/toolbarmerger.obj
# --- Targets ------------------------------------------------------