aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2012-08-21 07:37:56 -0700
committerPaul Eggert2012-08-21 07:37:56 -0700
commit01b13eb7fae39e64a3a6e2a0f5ef4ec058d16363 (patch)
tree8e71418cbda795d66f667f4a2be47716b58cf91b /ChangeLog
parent086ca913a8495b1d4f0d7eae58aea75f2f5e44ae (diff)
downloademacs-01b13eb7fae39e64a3a6e2a0f5ef4ec058d16363.tar.gz
emacs-01b13eb7fae39e64a3a6e2a0f5ef4ec058d16363.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 16afbdd3c99..4f339482a98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12012-08-21 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2012-08-20 extern-inline: support old GCC 'inline'
5
12012-08-20 Glenn Morris <rgm@gnu.org> 62012-08-20 Glenn Morris <rgm@gnu.org>
2 7
3 * configure.ac (AC_PROG_LN_S): Test for ln. 8 * configure.ac (AC_PROG_LN_S): Test for ln.