summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-06-09 14:20:06 +0000
committerzhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-06-09 14:20:06 +0000
commitd3e36f8c7dc8399f02a53eb58913db6a375a1ecb (patch)
tree29556d7b2622bf12ac1315158890548e5f8b5a6f
parent5a355e0c6f083cdbb3756fa3591d8f8a844ab111 (diff)
downloadATCD-d3e36f8c7dc8399f02a53eb58913db6a375a1ecb.tar.gz
deleted a unuseful line
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 59aff3f9b4e..506967febe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,7 +49,6 @@ Fri Jun 9 13:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/FILE_IO.cpp:
Added static cast from ACE_LOFF_T to size_t
->>>>>>> 4.10437
Fri Jun 9 13:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_sys_stat.inl: