aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2013-04-28 21:48:30 -0700
committerPaul Eggert2013-04-28 21:48:30 -0700
commitd9774ea487f683440a001d44a1487bbaefe1d310 (patch)
treef222c08653e2eb74d01dcb8abd44ae7acaa665c6 /ChangeLog
parent2ec12cb0f025b5476b8a1d7cacac2456bd5c1115 (diff)
downloademacs-d9774ea487f683440a001d44a1487bbaefe1d310.tar.gz
emacs-d9774ea487f683440a001d44a1487bbaefe1d310.zip
Merge from gnulib.
This incorporates: 2013-04-28 extern-inline: work around bug in Sun c99
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a6dfed3dc56..29433c8f132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-04-29 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2013-04-28 extern-inline: work around bug in Sun c99
5
12013-04-27 Paul Eggert <eggert@cs.ucla.edu> 62013-04-27 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Merge from gnulib, incorporating: 8 Merge from gnulib, incorporating: