diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-05-10 08:03:53 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-05-10 08:03:53 +0000 |
| commit | 2bae631d3b7c6dddf46a427b858c9543caab31dc (patch) | |
| tree | 0a31eec4e87fd91c56e847f93b3595212ade060b | |
| parent | 9d26ad5c536d7a064f45d6926a31fae8bcf7c047 (diff) | |
| download | ATCD-2bae631d3b7c6dddf46a427b858c9543caab31dc.tar.gz | |
Marker
| -rw-r--r-- | ACE/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 73a86be011e..30ab42b07d0 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -165,7 +165,6 @@ Fri Apr 12 19:30:05 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> * tests/Log_Msg_Test.cpp: Fixed problem for WCHAR build ->>>>>>> .r97068 Thu Apr 11 19:53:22 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> * ace/Log_Category.h: |