aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2012-07-15 11:18:37 -0700
committerPaul Eggert2012-07-15 11:18:37 -0700
commitb6e9e0ffacf249934e92448e85e965e90aa3cf4b (patch)
tree21abdf10950da2d63a8841b068b9e360b5e35cc9 /ChangeLog
parentce811ad97550ff70e2bd71e1ada496b4715d9b08 (diff)
downloademacs-b6e9e0ffacf249934e92448e85e965e90aa3cf4b.tar.gz
emacs-b6e9e0ffacf249934e92448e85e965e90aa3cf4b.zip
Merge from gnulib.
2012-07-15 pthread_sigmask: fix bug on FreeBSD 9 (Bug#11884) 2012-07-11 gettext: do not assume '#define ... defined ...' behavior
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b33b445adf..0cb8dd8a874 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12012-07-15 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2012-07-15 pthread_sigmask: fix bug on FreeBSD 9 (Bug#11884)
5 2012-07-11 gettext: do not assume '#define ... defined ...' behavior
6
12012-07-14 Glenn Morris <rgm@gnu.org> 72012-07-14 Glenn Morris <rgm@gnu.org>
2 8
3 * configure.ac (GC_SETJMP_WORKS, GC_MARK_STACK): Move here from src/s. 9 * configure.ac (GC_SETJMP_WORKS, GC_MARK_STACK): Move here from src/s.