summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-10-07 14:47:46 +0000
committerwilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-10-07 14:47:46 +0000
commita4128e366925ca79d6de72bf9e010260819e355f (patch)
tree6e5e9938267119d0481f4a715e3f17557ca3fd9a
parentcb1c0cc5f6176c4028f3d57da3e9faa1299a4832 (diff)
downloadATCD-a4128e366925ca79d6de72bf9e010260819e355f.tar.gz
ChangeLogTag: Tues Oct 7 08:44:52 2003 Dale Wilson <wilson_d@ociweb.com>
-rw-r--r--TAO/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 00c27d27389..9e51c761b81 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1775,7 +1775,6 @@ Thu Jul 03 17:03:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
Set correct BUILD_DLL define when building shared libs. This fixes
link errors in the Cygwin/MinGW and Kylix builds.
->>>>>>> 1.2069
Thu Jul 03 16:24:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp (init_endpoint):