aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2013-07-01 16:43:19 -0700
committerPaul Eggert2013-07-01 16:43:19 -0700
commitaaea7495957f5b82fe4e1c8a90a8d96cd77c0001 (patch)
treeaad1d58e24582aca9744e8c51ad1d514e1a5615f /ChangeLog
parentab71f1741c2583d2ae7c753743fc5da49a5ad093 (diff)
downloademacs-aaea7495957f5b82fe4e1c8a90a8d96cd77c0001.tar.gz
emacs-aaea7495957f5b82fe4e1c8a90a8d96cd77c0001.zip
Merge from gnulib.
This incorporates: 2013-06-23 ignore-value: port to gcc -pedantic 2013-06-21 extern-inline: port to gcc -std=c89
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 301e912f4d3..7610b19290f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
12013-06-30 Paul Eggert <eggert@cs.ucla.edu> 12013-06-30 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Merge from gnulib, incorporating:
4 2013-06-23 ignore-value: port to gcc -pedantic
5 2013-06-21 extern-inline: port to gcc -std=c89
6
3 Do not use GTK 3 if it exists but cannot be compiled. 7 Do not use GTK 3 if it exists but cannot be compiled.
4 * configure.ac: Leave GTK_OBJ and term_header alone if GTK 3 8 * configure.ac: Leave GTK_OBJ and term_header alone if GTK 3
5 exists but cannot be compiled. 9 exists but cannot be compiled.