Merge from mainline.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 6d4f6e0..6e6f935 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Import IRIX 6.5 getloadavg fixes from gnulib.
+       * configure, lib/getloadavg.c, m4/getloadavg.m4: Regenerate.
+
 2011-02-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        Import getloadavg module from gnulib.