INTEGRATION: CWS keyconfig01 (1.77.10); FILE MERGED

2004/07/10 18:25:04 as 1.77.10.5: RESYNC: (1.77-1.81); FILE MERGED
resolve merge conflict
2004/07/09 08:53:46 as 1.77.10.4: #i29863# use new helper to cache and share storages based on her relativ path names
2004/07/08 06:45:43 as 1.77.10.3: #i29863# support localized UI config, support new UI directory structure, adopt converter tool to support accelerators
2004/06/22 07:57:41 as 1.77.10.2: #i29863# second revision of shortcut configuration
2004/06/04 09:35:11 as 1.77.10.1: #i29863# new services for accelerator config
This commit is contained in:
Rüdiger Timm 2004-09-20 09:10:15 +00:00
parent 067f678dfb
commit eabee67902

View file

@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.84 $ # $Revision: 1.85 $
# #
# last change: $Author: obo $ $Date: 2004-09-09 17:14:15 $ # last change: $Author: rt $ $Date: 2004-09-20 10:10:15 $
# #
# 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
@ -291,8 +291,18 @@ SHL4OBJS= \
$(SLO)$/contenthandler.obj \ $(SLO)$/contenthandler.obj \
$(SLO)$/containerquery.obj \ $(SLO)$/containerquery.obj \
$(SLO)$/loadenv.obj \ $(SLO)$/loadenv.obj \
$(SLO)$/license.obj \
$(SLO)$/targethelper.obj \ $(SLO)$/targethelper.obj \
$(SLO)$/keymapping.obj \
$(SLO)$/storageholder.obj \
$(SLO)$/acceleratorcache.obj \
$(SLO)$/acceleratorconfigurationreader.obj \
$(SLO)$/acceleratorconfigurationwriter.obj \
$(SLO)$/acceleratorconfiguration.obj \
$(SLO)$/presethandler.obj \
$(SLO)$/globalacceleratorconfiguration.obj \
$(SLO)$/moduleacceleratorconfiguration.obj \
$(SLO)$/documentacceleratorconfiguration.obj \
$(SLO)$/license.obj \
$(SLO)$/windowstateconfiguration.obj \ $(SLO)$/windowstateconfiguration.obj \
$(SLO)$/toolboxfactory.obj \ $(SLO)$/toolboxfactory.obj \
$(SLO)$/addonstoolboxfactory.obj \ $(SLO)$/addonstoolboxfactory.obj \