Commit graph

425 commits

Author SHA1 Message Date
Rüdiger Timm
30709f260b INTEGRATION: CWS ause060 (1.8.126); FILE MERGED
2006/09/22 18:01:32 hjs 1.8.126.1: #i69234# call required makefile
2006-10-30 07:33:34 +00:00
Rüdiger Timm
8ee3f5a7e4 INTEGRATION: CWS ause060 (1.1.2); FILE ADDED
2006/09/27 09:16:02 hjs 1.1.2.2: #i69234# wrong PRJNAME
2006/09/22 18:01:27 hjs 1.1.2.1: #i69234# add required makefile
2006-10-30 07:31:45 +00:00
Mikhail Voitenko
ddce491ebc #100000# resolve problems of merging with warning free cws changes 2006-10-16 05:20:56 +00:00
Oliver Bolte
2bf02a1598 INTEGRATION: CWS opofxmlstorage (1.4.40); FILE MERGED
2006/06/30 15:03:42 mav 1.4.40.4: resync to m173: fix warnings
2006/06/29 12:54:11 mav 1.4.40.3: RESYNC: (1.4-1.5); FILE MERGED
2006/05/23 15:45:58 mav 1.4.40.2: #122878# Iconified object replacement image must be handled by the container
2006/05/23 15:11:12 mav 1.4.40.1: #122878# Iconified object replacement image must be handled by the container
2006-10-13 10:31:55 +00:00
Oliver Bolte
296f8db090 INTEGRATION: CWS opofxmlstorage (1.7.12); FILE MERGED
2006/09/05 15:29:35 mav 1.7.12.2: #122878# fix math object
2006/08/16 15:33:18 mav 1.7.12.1: #i68684# allow to insert iconified objects
2006-10-13 10:31:52 +00:00
Oliver Bolte
c98507c478 INTEGRATION: CWS opofxmlstorage (1.14.6); FILE MERGED
2006/06/30 15:06:03 mav 1.14.6.4: resync to m173: fix warnings
2006/06/29 12:55:46 mav 1.14.6.3: RESYNC: (1.14-1.15); FILE MERGED
2006/05/23 15:45:59 mav 1.14.6.2: #122878# Iconified object replacement image must be handled by the container
2006/05/23 15:11:16 mav 1.14.6.1: #122878# Iconified object replacement image must be handled by the container
2006-10-13 10:31:38 +00:00
Oliver Bolte
fb1818efb7 INTEGRATION: CWS opofxmlstorage (1.28.6); FILE MERGED
2006/08/09 10:29:12 mav 1.28.6.3: RESYNC: (1.29-1.30); FILE MERGED
2006/06/29 12:55:31 mav 1.28.6.2: RESYNC: (1.28-1.29); FILE MERGED
2006/05/23 15:11:15 mav 1.28.6.1: #122878# Iconified object replacement image must be handled by the container
2006-10-13 10:31:24 +00:00
Oliver Bolte
82289ce1a7 INTEGRATION: CWS opofxmlstorage (1.33.12); FILE MERGED
2006/06/29 12:55:04 mav 1.33.12.2: RESYNC: (1.33-1.34); FILE MERGED
2006/05/23 15:11:15 mav 1.33.12.1: #122878# Iconified object replacement image must be handled by the container
2006-10-13 10:31:02 +00:00
Oliver Bolte
0ce4389fe8 INTEGRATION: CWS opofxmlstorage (1.2.18); FILE MERGED
2006/05/23 15:11:14 mav 1.2.18.1: #122878# Iconified object replacement image must be handled by the container
2006-10-13 10:30:47 +00:00
Oliver Bolte
c433034656 INTEGRATION: CWS opofxmlstorage (1.7.18); FILE MERGED
2006/05/23 15:11:14 mav 1.7.18.1: #122878# Iconified object replacement image must be handled by the container
2006-10-13 10:30:34 +00:00
Oliver Bolte
cb90eca3d2 INTEGRATION: CWS opofxmlstorage (1.24.6); FILE MERGED
2006/05/23 15:11:13 mav 1.24.6.1: #122878# Iconified object replacement image must be handled by the container
2006-10-13 10:30:21 +00:00
Oliver Bolte
508a7007da INTEGRATION: CWS opofxmlstorage (1.6.14); FILE MERGED
2006/06/30 15:03:43 mav 1.6.14.4: resync to m173: fix warnings
2006/06/29 12:54:18 mav 1.6.14.3: RESYNC: (1.6-1.7); FILE MERGED
2006/05/23 15:45:59 mav 1.6.14.2: #122878# Iconified object replacement image must be handled by the container
2006/05/23 15:11:13 mav 1.6.14.1: #122878# Iconified object replacement image must be handled by the container
2006-10-13 10:30:08 +00:00
Oliver Bolte
2b446c1ed0 INTEGRATION: CWS opofxmlstorage (1.1.2); FILE ADDED
2006/05/19 11:43:44 mav 1.1.2.1: #i65548# test embedding API
2006-10-13 10:29:32 +00:00
Oliver Bolte
44e70d9640 INTEGRATION: CWS opofxmlstorage (1.1.2); FILE ADDED
2006/05/19 11:43:34 mav 1.1.2.1: #i65548# test embedding API
2006-10-13 10:29:21 +00:00
Oliver Bolte
c85f138a6c INTEGRATION: CWS opofxmlstorage (1.1.2); FILE ADDED
2006/09/15 11:11:33 mav 1.1.2.2: #i69455# add Graphic property
2006/05/19 11:43:33 mav 1.1.2.1: #i65548# test embedding API
2006-10-13 10:29:09 +00:00
Oliver Bolte
97d9381cb0 INTEGRATION: CWS opofxmlstorage (1.1.2); FILE ADDED
2006/05/19 11:43:33 mav 1.1.2.1: #i65548# test embedding API
2006-10-13 10:28:57 +00:00
Oliver Bolte
8e9c0ba1d3 INTEGRATION: CWS sb59 (1.2.64); FILE MERGED
2006/09/29 13:47:31 sb 1.2.64.2: Manually merged in 1.3 (from SRC680m186).
2006/08/29 14:08:21 sb 1.2.64.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 13:09:05 +00:00
Oliver Bolte
1aeeeaa4bf INTEGRATION: CWS sb59 (1.2.64); FILE MERGED
2006/09/29 13:43:43 sb 1.2.64.2: Manually merged in 1.3 (from SRC680m186).
2006/08/29 14:08:20 sb 1.2.64.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 13:07:48 +00:00
Oliver Bolte
a89be27bc2 INTEGRATION: CWS sb59 (1.7.24); FILE MERGED
2006/08/29 14:08:22 sb 1.7.24.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:24:14 +00:00
Oliver Bolte
9e06381a9e INTEGRATION: CWS sb59 (1.7.36); FILE MERGED
2006/08/29 14:08:21 sb 1.7.36.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:24:02 +00:00
Oliver Bolte
c1be626337 INTEGRATION: CWS sb59 (1.2.64); FILE MERGED
2006/08/29 14:08:21 sb 1.2.64.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:23:42 +00:00
Oliver Bolte
8c06bf2b3a INTEGRATION: CWS sb59 (1.3.64); FILE MERGED
2006/08/29 14:08:21 sb 1.3.64.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:23:30 +00:00
Oliver Bolte
35330f3d9a INTEGRATION: CWS sb59 (1.15.20); FILE MERGED
2006/08/29 14:08:21 sb 1.15.20.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:23:17 +00:00
Oliver Bolte
f2598cfe67 INTEGRATION: CWS sb59 (1.30.14); FILE MERGED
2006/08/29 14:08:21 sb 1.30.14.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:23:05 +00:00
Oliver Bolte
c926d39ae5 INTEGRATION: CWS sb59 (1.23.24); FILE MERGED
2006/08/29 14:08:21 sb 1.23.24.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:22:51 +00:00
Oliver Bolte
36cb6e6aa8 INTEGRATION: CWS sb59 (1.17.24); FILE MERGED
2006/08/29 14:08:20 sb 1.17.24.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:22:40 +00:00
Oliver Bolte
02694cb530 INTEGRATION: CWS sb59 (1.19.42); FILE MERGED
2006/08/29 14:08:20 sb 1.19.42.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:22:26 +00:00
Oliver Bolte
2c823463a2 INTEGRATION: CWS sb59 (1.34.18); FILE MERGED
2006/08/29 14:08:20 sb 1.34.18.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:22:14 +00:00
Oliver Bolte
b496965326 INTEGRATION: CWS sb59 (1.7.42); FILE MERGED
2006/08/29 14:08:20 sb 1.7.42.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:22:03 +00:00
Oliver Bolte
76e46e4845 INTEGRATION: CWS sb59 (1.3.64); FILE MERGED
2006/08/29 14:08:19 sb 1.3.64.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:21:42 +00:00
Oliver Bolte
099d71b2f8 INTEGRATION: CWS sb59 (1.11.42); FILE MERGED
2006/08/29 14:08:19 sb 1.11.42.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:21:30 +00:00
Oliver Bolte
fc9896ead9 INTEGRATION: CWS sb59 (1.11.24); FILE MERGED
2006/08/29 14:08:19 sb 1.11.24.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:21:20 +00:00
Oliver Bolte
73cdbe02a8 INTEGRATION: CWS sb59 (1.7.22); FILE MERGED
2006/08/29 14:08:19 sb 1.7.22.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:21:06 +00:00
Oliver Bolte
f24c53389f INTEGRATION: CWS sb59 (1.5.22); FILE MERGED
2006/08/29 14:08:19 sb 1.5.22.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:20:53 +00:00
Oliver Bolte
5cabb46bff INTEGRATION: CWS sb59 (1.24.18); FILE MERGED
2006/08/29 14:08:18 sb 1.24.18.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:20:41 +00:00
Oliver Bolte
ab1ac69251 INTEGRATION: CWS sb59 (1.18.24); FILE MERGED
2006/08/29 14:08:18 sb 1.18.24.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:20:29 +00:00
Oliver Bolte
0041c0b8ac INTEGRATION: CWS sb59 (1.4.24); FILE MERGED
2006/08/29 14:08:18 sb 1.4.24.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:20:16 +00:00
Oliver Bolte
d69607b49b INTEGRATION: CWS sb59 (1.19.20); FILE MERGED
2006/08/29 14:08:18 sb 1.19.20.1: #i67487# Made code warning-free (wntmsci10).
2006-10-12 10:20:02 +00:00
Kurt Zenker
a059ae18bc INTEGRATION: CWS fwk46 (1.24.10); FILE MERGED
2006/08/17 09:46:06 mav 1.24.10.1: #i65568# do not switch the persistance of the linked document
2006-10-06 09:37:30 +00:00
Vladimir Glazounov
b82ec6e358 INTEGRATION: CWS obo05 (1.2.62); FILE MERGED
2006/08/25 07:35:38 obo 1.2.62.1: #i53611# header changed
2006-09-25 12:02:05 +00:00
Vladimir Glazounov
b825663cdd INTEGRATION: CWS obo05 (1.10.36); FILE MERGED
2006/08/25 07:37:48 obo 1.10.36.1: #i53611# mfc header
2006-09-25 12:01:51 +00:00
Vladimir Glazounov
ccdf740d5f INTEGRATION: CWS obo05 (1.2.62); FILE MERGED
2006/08/25 07:38:42 obo 1.2.62.1: #i53611# destructor missing
2006-09-25 12:01:39 +00:00
Oliver Bolte
d1e47ef4c4 INTEGRATION: CWS pchfix02 (1.4.58); FILE MERGED
2006/09/01 17:25:55 kaib 1.4.58.1: #i68856# Added header markers and pch files
2006-09-16 23:47:11 +00:00
Oliver Bolte
5d2be1a460 INTEGRATION: CWS pchfix02 (1.3.58); FILE MERGED
2006/09/01 17:25:55 kaib 1.3.58.1: #i68856# Added header markers and pch files
2006-09-16 23:46:57 +00:00
Oliver Bolte
69b8a6515d INTEGRATION: CWS pchfix02 (1.3.58); FILE MERGED
2006/09/01 17:25:54 kaib 1.3.58.1: #i68856# Added header markers and pch files
2006-09-16 23:46:30 +00:00
Oliver Bolte
125c4242c6 INTEGRATION: CWS pchfix02 (1.2.58); FILE MERGED
2006/09/01 17:25:54 kaib 1.2.58.1: #i68856# Added header markers and pch files
2006-09-16 23:46:17 +00:00
Oliver Bolte
5998237c20 INTEGRATION: CWS pchfix02 (1.7.18); FILE MERGED
2006/09/01 17:25:54 kaib 1.7.18.1: #i68856# Added header markers and pch files
2006-09-16 23:46:03 +00:00
Oliver Bolte
c8d3152f06 INTEGRATION: CWS pchfix02 (1.7.30); FILE MERGED
2006/09/01 17:25:54 kaib 1.7.30.1: #i68856# Added header markers and pch files
2006-09-16 23:45:49 +00:00
Oliver Bolte
9a36690044 INTEGRATION: CWS pchfix02 (1.5.16); FILE MERGED
2006/09/01 17:25:54 kaib 1.5.16.1: #i68856# Added header markers and pch files
2006-09-16 23:45:36 +00:00
Oliver Bolte
a3de99ab85 INTEGRATION: CWS pchfix02 (1.3.58); FILE MERGED
2006/09/01 17:25:53 kaib 1.3.58.1: #i68856# Added header markers and pch files
2006-09-16 23:45:22 +00:00