diff options
| author | Miro Jurisic <meeroh@mit.edu> | 2001-03-21 02:09:19 +0000 |
|---|---|---|
| committer | Miro Jurisic <meeroh@mit.edu> | 2001-03-21 02:09:19 +0000 |
| commit | fb1d347c9085cdb0503d4ff06383b484ee54dc3f (patch) | |
| tree | 4ffff7baff18c1f20059faed6833fa1b93362193 /src/include/krb5 | |
| parent | 5714699986cdba51380e7e0d661247c1867f0987 (diff) | |
| download | krb5-fb1d347c9085cdb0503d4ff06383b484ee54dc3f.zip krb5-fb1d347c9085cdb0503d4ff06383b484ee54dc3f.tar.gz krb5-fb1d347c9085cdb0503d4ff06383b484ee54dc3f.tar.bz2 | |
macsock.h: Updated Utilities.h and sockets includes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13109 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/krb5')
| -rw-r--r-- | src/include/krb5/ChangeLog | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index 311030c..7842603 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,7 +1,21 @@ +<<<<<<< ChangeLog +2001-03-20 Miro Jurisic <meeroh@mit.edu> +======= Mon Feb 26 13:22:43 2001 Ezra Peisach <epeisach@mit.edu> +>>>>>>> 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 <lxs@mit.edu> + + * kdb.h: added Mac OS X #define (__MACH__) -- we're still a kerberos client + +======= 2001-01-16 Ken Raeburn <raeburn@mit.edu> * adm_proto.h, kdb.h, kdb_dbc.h, kdb_dbm.h, kdb_kt.h: Make all @@ -12,6 +26,7 @@ Mon Feb 26 13:22:43 2001 Ezra Peisach <epeisach@mit.edu> * 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 <lxs@mit.edu> * macsock.h: local_addr_fallback_kludge defined to 0 |