diff options
Diffstat (limited to 'ACE/ChangeLog')
| -rw-r--r-- | ACE/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1490eb12124..1afdad6fe43 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 18 16:06:27 UTC 2011 William Otte <wotte@Williams-MacBook-Air.local> + + * ace/OS_NS_errno.h: + + Resolved conflict from merge from head. + Mon Jul 18 15:35:27 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> * ace/OS_NS_errno.h: |