From 3d3c4d081c091f6dcb3183b3de77c4631176f391 Mon Sep 17 00:00:00 2001 From: Miro Jurisic Date: Wed, 21 Mar 2001 02:15:13 +0000 Subject: [PATCH] I didn't intend to commit that on the trunk (oops). Undoing git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13111 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/krb5/ChangeLog | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index 784260348..311030c08 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,21 +1,7 @@ -<<<<<<< ChangeLog -2001-03-20 Miro Jurisic -======= Mon Feb 26 13:22:43 2001 Ezra Peisach ->>>>>>> 5.186 -<<<<<<< ChangeLog - * macsock.h: Updated Utilities.h and sockets includes -======= * adm_proto.h (krb5_adm_connect): Declare prompt string const char *. ->>>>>>> 5.186 -<<<<<<< ChangeLog -2000-10-02 Alexandra Ellwood - - * kdb.h: added Mac OS X #define (__MACH__) -- we're still a kerberos client - -======= 2001-01-16 Ken Raeburn * adm_proto.h, kdb.h, kdb_dbc.h, kdb_dbm.h, kdb_kt.h: Make all @@ -26,7 +12,6 @@ Mon Feb 26 13:22:43 2001 Ezra Peisach * Makefile.in, osconf.h: Use bindir and sbindir from configure rather than building them up from EXEC_PREFIX. ->>>>>>> 5.186 2000-5-18 Alexandra Ellwood * macsock.h: local_addr_fallback_kludge defined to 0 -- 2.26.2