*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index b0e43629424dc13fd6a0d5270737942bd4c19866..b270bcbf16886d9f14550bbb7ddfb1f819f18be5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
-2006-03-11  Eric Blake  <ebb9@byu.net>
+2006-03-27  Jim Meyering  <jim@meyering.net>
 
        * Version 6.0-cvs.
 
+       * src/Makefile.am (uptime_LDADD): Add $(POW_LIB), for uptime's
+       use of strtod.  Tiny patch from Nickolai Zeldovich.
+
+2006-03-11  Eric Blake  <ebb9@byu.net>
+
        * tests/misc/dirname: New file.
        * tests/basename/Makefile.am: Delete.
        * tests/basename/basic: Move to...

diff --git a/THANKS b/THANKS
index 725db73e9c0a3d4bdb2e4eb06302f80b1ac510cf..f1e54454ff41623d388a7b7093e48bf25a2d98a3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -359,6 +359,7 @@ Neil Brown                          neilb@cse.unsw.edu.au
 Nelson H. F. Beebe                  beebe@math.utah.edu
 Nick Estes                          debian@nickstoys.com
 Nick Lawes                          nlawes@silverplatter.com
+Nickolai Zeldovich                  nickolai@cs.stanford.edu
 Nicolas François                    nicolas.francois@centraliens.net
 Niklas Edmundsson                   nikke@acc.umu.se
 Nikola Milutinovic                  Nikola.Milutinovic@ev.co.yu