summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-10-27 09:59:33 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-10-27 09:59:33 +0000
commit9bcdbf676ac0f5de17c95f1ab008d5800c82a798 (patch)
treeaeb8dae2a0f4192bfe03d0c10f2a5c40c20276fb /ACE
parente012dc2c60ba81e9775214df0b1909d92a9f45f4 (diff)
downloadATCD-9bcdbf676ac0f5de17c95f1ab008d5800c82a798.tar.gz
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ChangeLog3
1 files changed, 1 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8d0ce347f33..38a37591889 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -3,7 +3,7 @@ Tue Oct 27 08:22:25 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
* include/makeinclude/platform_macosx_tiger.GNU:
fixed typo.
-
+
Tue Oct 27 08:12:25 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
* ace/config-macosx-snowleopard.h:
@@ -82,7 +82,6 @@ Mon Oct 26 08:32:08 UTC 2009 Olli Savia <ops@iki.fi>
with an output stream. This may happen with Windows application
without a console window.
->>>>>>> .r87235
Mon Oct 26 07:48:19 UTC 2009 Olli Savia <ops@iki.fi>
* ace/config-win32-msvc-10.h: