projects / krb5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f8b2914) | patch
punt leftover conflict markers
authorTom Yu <tlyu@mit.edu>
Sat, 10 May 2003 01:27:15 +0000 (01:27 +0000)
committerTom Yu <tlyu@mit.edu>
Sat, 10 May 2003 01:27:15 +0000 (01:27 +0000)
commitadd085032f4694dece32c11662cbdfe0c5b29043
tree3411a66b21d0782f51a4cde0072329ba82777618tree | snapshot
parentf8b2914cc1ba92bdbde0979b0a1344687925945fcommit | diff
punt leftover conflict markers

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15410 dc483132-0cff-0310-8789-dd5450dbe970
src/lib/krb5/krb/ChangeLog diff | blob | history
MIT implementation of the Kerberos network authentication protocol. This repo may be rebased, so don't base your work on it. Use git://github.com/krb5/krb5 instead.