summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiro Jurisic <meeroh@mit.edu>1999-07-26 16:34:13 +0000
committerMiro Jurisic <meeroh@mit.edu>1999-07-26 16:34:13 +0000
commitec302dab0de052ced36051b4a577c60de07caf2c (patch)
tree79a99fb77715e8b4ac420472cf41614f3dbe045f /src
parent78c27d3c0f4358d64b2a923c2d4ad825d023474f (diff)
downloadkrb5-ec302dab0de052ced36051b4a577c60de07caf2c.tar.gz
krb5-ec302dab0de052ced36051b4a577c60de07caf2c.tar.xz
krb5-ec302dab0de052ced36051b4a577c60de07caf2c.zip
c_ustime.c, init_os_ctx.c: merged changes from the Mac_V2_0_derivatives branch
init_os_ctx.x: added krb5_get_profile git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11597 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/os/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index a13280f70..7ea80f4f2 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,14 @@
+1999-07-26 Miro Jurisic <meeroh@mit.edu>
+
+ * c_ustime.c (krb5_crypto_us_timeofday): Merged in changes from the
+ Mac_V2_0_derivatives branch -- microseconds support and guaranteed
+ monotonically increasing microseconds on MacOS
+
+ * init_os_ctx.c (os_get_default_config_files): Merged in changes from the
+ Mac_V2_0_derivatives branch -- NRL config file name
+
+ * init_os_ctx.c (krb5_get_profile): added krb5_get_profile
+
1999-07-22 Jeffrey Altman <jaltman@columbia.edu>
* init_os_ctx.c (os_init_paths)