summaryrefslogtreecommitdiffstats
path: root/src/include/ChangeLog
diff options
context:
space:
mode:
authorJeffrey Altman <jaltman@secure-endpoints.com>2004-07-15 07:39:14 +0000
committerJeffrey Altman <jaltman@secure-endpoints.com>2004-07-15 07:39:14 +0000
commit79669ddb86c47f6f2cfaf6bd7105b448ed29de05 (patch)
tree253e3264238434d95e31b2ff71e5c97ba686e97a /src/include/ChangeLog
parent492e321bff67f150817dac59d9633bd17a07ccd7 (diff)
downloadkrb5-79669ddb86c47f6f2cfaf6bd7105b448ed29de05.tar.gz
krb5-79669ddb86c47f6f2cfaf6bd7105b448ed29de05.tar.xz
krb5-79669ddb86c47f6f2cfaf6bd7105b448ed29de05.zip
fix previous commit
ticket: 2637 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16601 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/ChangeLog')
-rw-r--r--src/include/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 75eb6c6a62..04be6e5877 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -32,7 +32,6 @@
* fake-addrinfo.h (in6addr_any): If we need to define a static
copy, rename it with a macro first.
->>>>>>> 1.444
2004-07-09 Ken Raeburn <raeburn@mit.edu>
* k5-thread.h: Test HAVE_PTHREAD instead of HAVE_PTHREAD_H.