380f8d4a8f
INTEGRATION: CWS os35 (1.17.8); FILE MERGED
...
2004/07/16 13:56:37 dr 1.17.8.3: #i10000# merge error
2004/07/15 15:37:23 dr 1.17.8.2: RESYNC: (1.17-1.21); FILE MERGED
2004/07/12 16:16:34 cd 1.17.8.1: #i31348# New popup menu controller for recent file list
2004-08-02 12:15:46 +00:00
158d6ad96d
INTEGRATION: CWS fwklhf01 (1.16.2); FILE MERGED
...
2004/06/28 13:03:57 as 1.16.2.2: RESYNC: (1.16-1.17); FILE MERGED
2004/06/23 09:21:46 lo 1.16.2.1: #i30017# clean up resource
2004-07-23 10:26:55 +00:00
71bd72c77a
#i10000# resolver merge problems
2004-07-07 10:51:41 +00:00
a161f5726c
INTEGRATION: CWS docking1 (1.11.2); FILE MERGED
...
2004/07/06 10:08:39 cd 1.11.2.4: RESYNC manually
2004/06/01 10:55:36 cd 1.11.2.3: #i10000# Fixed merge problems
2004/05/31 04:19:21 cd 1.11.2.2: RESYNC: (1.11-1.12); FILE MERGED
2004/04/05 08:06:46 cd 1.11.2.1: #i24937# Programmatic control of toolbar items
2004-07-06 15:56:35 +00:00
b6543fbfe5
#i10000# adopt to ISO codes
2004-06-30 09:22:18 +00:00
80fd2208a3
INTEGRATION: CWS mergebuild (1.8.30); FILE MERGED
...
2004/05/19 17:38:42 hjs 1.8.30.5: #i8252# fix resync problems
2004/05/18 17:31:01 hjs 1.8.30.4: RESYNC: (1.11-1.12); FILE MERGED
2004/04/21 06:21:24 hjs 1.8.30.3: RESYNC: (1.8-1.11); FILE MERGED
2003/11/11 19:18:02 ihi 1.8.30.2: en -> en-US
2003/11/10 16:45:28 ihi 1.8.30.1: #111234# Merge during build
2004-06-25 14:36:07 +00:00
1bfa227a9d
#i10000# fix last merge
2004-06-17 13:08:20 +00:00
289ca2e55d
#i10000# Use standard location specification
2004-06-14 08:37:20 +00:00
b48e8c7e75
conflict corrected
2004-06-11 17:47:55 +00:00
61179b33bb
INTEGRATION: CWS networker3 (1.11.28); FILE MERGED
...
2004/05/24 14:58:05 lo 1.11.28.1: #i26374# change license/splashscreen behaviour
2004-06-11 17:46:40 +00:00
8e1aef3bfc
INTEGRATION: CWS fwk02ea (1.11.26); FILE MERGED
...
2004/06/01 15:31:27 lo 1.11.26.1: #i29643# #i26375# licens dialog behavior + helpids
2004-06-10 15:18:31 +00:00
7e003738f4
INTEGRATION: CWS fwkbugfix02 (1.11.6); FILE MERGED
...
2004/04/14 16:07:28 mav 1.11.6.1: #116355# Save copy as
2004-05-10 16:49:34 +00:00
9881348885
INTEGRATION: CWS fwkbugfix01 (1.10.6); FILE MERGED
...
2004/03/09 07:14:32 cd 1.10.6.1: #115843# Support placeholders ($1) and ($2) for outplace activation within menus
2004-03-17 11:18:36 +00:00
7528cec4ca
INTEGRATION: CWS layoutmanager (1.9.16); FILE MERGED
...
2004/02/03 15:29:36 cd 1.9.16.1: #i25017# Use resource for menu item inside popup menu controller
2004-02-25 16:45:12 +00:00
091162a4ea
INTEGRATION: CWS geordi2q11 (1.8.60); FILE MERGED
...
2003/12/16 12:40:45 hr 1.8.60.1: #111934#: join CWS ooo111fix1
2003-12-17 17:37:20 +00:00
f0a0e4fc13
INTEGRATION: CWS mergerc3 (1.7.4); FILE MERGED
...
2003/07/16 17:01:15 ihi 1.7.4.1: rc-3 merge all languages
2003-07-17 10:43:12 +00:00
4fe430041a
INTEGRATION: CWS rc2merge (1.6.10); FILE MERGED
...
2003/07/03 14:34:11 ihi 1.6.10.1: rc-2 merge all languages
2003-07-03 16:25:30 +00:00
c5e976ffd3
INTEGRATION: CWS rcmerge (1.5.22); FILE MERGED
...
2003/06/12 11:11:07 gh 1.5.22.1: final Merge RC
2003-06-13 13:00:22 +00:00
b448244518
INTEGRATION: CWS mergem8 (1.2.2.1.24); FILE MERGED
...
2003/04/29 08:29:12 gh 1.2.2.1.24.3: final merge for Beta2
2003/04/16 12:20:10 gh 1.2.2.1.24.2: RESYNC: (1.2.2.1-1.4); FILE MERGED
2003/04/14 14:53:26 gh 1.2.2.1.24.1: merging all languages
2003-04-29 15:50:54 +00:00
060cc7648f
INTEGRATION: CWS fwk01 (1.2.2.1.6); FILE MERGED
...
2003/03/10 14:03:16 cd 1.2.2.1.6.1: #107568# Added support for Add-Ons help integration
2003-04-04 16:15:25 +00:00
4011187ff5
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-25 17:22:13 +00:00
87962796d8
Merge SRX644: 04.11.02 - 17:13:59
2002-11-04 15:18:02 +00:00
123f4105c3
#102630# Added new general resource file
2002-10-11 13:20:36 +00:00
