summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Horowitz <marc@mit.edu>1996-07-26 21:24:00 +0000
committerMarc Horowitz <marc@mit.edu>1996-07-26 21:24:00 +0000
commitb25da847e069fe2fa82de6986e561360354da807 (patch)
treea6603529b8e682cdf930fbdaaef5bf203c7771c2 /src
parent8c7af3b0450bf9360b2e29aac72d127b6e4ef3c4 (diff)
downloadkrb5-b25da847e069fe2fa82de6986e561360354da807.tar.gz
krb5-b25da847e069fe2fa82de6986e561360354da807.tar.xz
krb5-b25da847e069fe2fa82de6986e561360354da807.zip
resolved conflicts
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8845 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 59f329bc2..3ae53e19e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 26 15:07:51 1996 Marc Horowitz <marc@mit.edu>
+
+ * aclocal.m4 (LIBS): include -lgen if compile() is present and
+ -lkrb5 is used.
+
Tue Jul 23 00:36:46 1996 Theodore Y. Ts'o <tytso@mit.edu>
* acconfig.h: Add contents of util/db2/acconfig.h so that