diff options
| author | Will Fiveash <will.fiveash@oracle.com> | 2009-01-28 21:15:46 +0000 |
|---|---|---|
| committer | Will Fiveash <will.fiveash@oracle.com> | 2009-01-28 21:15:46 +0000 |
| commit | d91a7ff0542f620a296e5718c1c5d33240efa67a (patch) | |
| tree | a7c1efa10a6a7f928c47d274307d5eaceffec107 /src/kadmin/dbutil/kdb5_util.h | |
| parent | 51049b194ad6d4c6ef088d9c277b59129888c1a9 (diff) | |
| download | krb5-d91a7ff0542f620a296e5718c1c5d33240efa67a.zip krb5-d91a7ff0542f620a296e5718c1c5d33240efa67a.tar.gz krb5-d91a7ff0542f620a296e5718c1c5d33240efa67a.tar.bz2 | |
svn merge -r21791:21820 svn+ssh://wfiveash@svn.mit.edu/krb5/trunk
All conflicts resolved, everything builds. Did a quick test, seems to
work ok.
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mkey_migrate@21822 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/dbutil/kdb5_util.h')
0 files changed, 0 insertions, 0 deletions