summaryrefslogtreecommitdiffstats
path: root/src/include/krb5/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/krb5/ChangeLog')
-rw-r--r--src/include/krb5/ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index adc0fabd5..123349af2 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< ChangeLog
Wed Jun 12 00:40:29 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* adm_proto.h: Change usage of INTERFACE to use KRB5_CALLCONV and
@@ -24,6 +25,12 @@ Sun May 19 14:32:19 1996 Sam Hartman <hartmans@tertius.mit.edu>
* configure.in: Check for uid_t.
+Sun May 12 00:46:05 1996 Marc Horowitz <marc@mit.edu>
+
+ * kdb.h: convert to use new krb5_dbe_* tl_data functions.
+
+ * adm.h (struct __krb5_realm_params): add realm_acl_file
+
Tue Apr 30 17:15:57 1996 Ken Raeburn <raeburn@cygnus.com>
* configure.in: Invoke AC_C_CROSS before AC_TRY_RUN to pretty up