summaryrefslogtreecommitdiffstats
path: root/src/lib/ChangeLog
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2003-01-13 04:51:26 +0000
committerTom Yu <tlyu@mit.edu>2003-01-13 04:51:26 +0000
commitbd676737f1fb1b09204dce82d280bc01c995e6d0 (patch)
tree2c8c7704efd2e78d966dc49fcc2083bede80b9ba /src/lib/ChangeLog
parent8e09edfcde5ab3f802cae36578e4c5ec69e72fa8 (diff)
downloadkrb5-bd676737f1fb1b09204dce82d280bc01c995e6d0.tar.gz
krb5-bd676737f1fb1b09204dce82d280bc01c995e6d0.tar.xz
krb5-bd676737f1fb1b09204dce82d280bc01c995e6d0.zip
This should be all that remains of the 1-2-2-branch merge; some
additional sanity-checking of merge needed though. * krb5_32.def: Merge from 1-2-2-branch. ticket: 1177 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15117 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/ChangeLog')
-rw-r--r--src/lib/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index ebebb73344..e0fb66ac31 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-12 Tom Yu <tlyu@mit.edu>
+
+ * krb5_32.def: Merge from 1-2-2-branch.
+
2003-01-06 Sam Hartman <hartmans@mit.edu>
* krb5_32.def: Export krb5_auth_con_*_checksum_func