summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-06-19 11:22:16 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-06-19 11:22:16 -0700
commitadd3f049962534b7d8412517b69d53a3f411c5de (patch)
treec77516b91dafd04c88101dc4d825fad5d1544b2c /ChangeLog
parent9a028c23fb03e29337425bb351fe5786a19ccca6 (diff)
downloademacs-add3f049962534b7d8412517b69d53a3f411c5de.tar.gz
* lib/unistd.in.h, m4/getloadavg.m4: Merge from gnulib.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d8e48ab2c1c..e4a4754f86f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-19 Paul Eggert <eggert@cs.ucla.edu>
+
+ * lib/unistd.in.h, m4/getloadavg.m4: Merge from gnulib.
+
2011-06-17 Glenn Morris <rgm@gnu.org>
* configure.in: Restore the behavior of checking crt-dir only