summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2006-03-22 22:43:57 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2006-03-22 22:43:57 +0000
commit0133883ae1dbb0e855555683205bdb7e19737cfc (patch)
tree8b2a026d520acae1fe96c66d2c6008421d4cee76
parent2bc8343004befc2654f0cbfa133474799e6f544f (diff)
downloadATCD-0133883ae1dbb0e855555683205bdb7e19737cfc.tar.gz
ChangeLogTag:Wed Mar 22 18:26:36 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 492141ed656..8177ef1f718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -544,7 +544,6 @@ Fri Mar 10 08:58:52 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Add pkg.m4 from pkg-config 0.20 distribution, so configure
script can be regenerated on systems without it installed.
->>>>>>> 4.10049
Thu Mar 9 09:18:58 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu>
* COPYING: Updated the date to include 2006.