commit | 8e075fbbda35fd04367d7361c23615e7c6198f09 | [log] [tgz] |
---|---|---|
author | John Hughes <john@Calva.COM> | Tue Mar 27 13:57:48 2001 +0000 |
committer | John Hughes <john@Calva.COM> | Tue Mar 27 13:57:48 2001 +0000 |
tree | 833643dc8e34446cdf23375c9a35904e64d346f9 | |
parent | c1652e2095fcd9ac62cf2669ef6aec5fd0052851 [diff] [blame] |
Fix bad merge of solaris patch
diff --git a/ChangeLog b/ChangeLog index eae2810..1d8c272 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -1,3 +1,8 @@ +2001-03-27 John Hughes <john@Calva.COM> + + * svr4/syscallent.h: ntp_adjtime entry was duplicated on Solaris + systems - bad merge of Harald Boehme's patch by me. + 2001-03-19 Wichert Akkerman <wakkerma@debian.org> * linux/mips/syscallent.h: we can't have -1 nargs, change to 0