aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2012-09-29 21:19:32 -0700
committerPaul Eggert2012-09-29 21:19:32 -0700
commit65788e2e93a48015493514b7e8b712700d31a7a2 (patch)
treebf57bd85f8cadfe03ad1eac60119bb61f4851268 /ChangeLog
parent34cf6f39526599378cc1d5800e707a8a6e80c8dd (diff)
downloademacs-65788e2e93a48015493514b7e8b712700d31a7a2.tar.gz
emacs-65788e2e93a48015493514b7e8b712700d31a7a2.zip
Merge from gnulib.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c7de7d7c14d..411ef633420 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12012-09-30 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2012-09-28 extern-inline: provide a -Wundef safe config.h
5
12012-09-27 Paul Eggert <eggert@cs.ucla.edu> 62012-09-27 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Check more robustly for timer_settime. 8 Check more robustly for timer_settime.