aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2014-09-23 11:20:38 -0700
committerPaul Eggert2014-09-23 11:20:38 -0700
commitdac5be10f3f08c78cf98a4b9d4774b46b16ace40 (patch)
tree033b7d9bd6a55d38a92238f99c85aa88e9f05fed /ChangeLog
parent97914756e8de76b8e83550eab2e12e5dfcb87754 (diff)
downloademacs-dac5be10f3f08c78cf98a4b9d4774b46b16ace40.tar.gz
emacs-dac5be10f3f08c78cf98a4b9d4774b46b16ace40.zip
Merge from gnulib.
This incorporates: 2014-09-11 fcntl-h: fix compilation with Intel C++ compiler 2014-09-04 pthread, pthread_sigmask, threadlib: port to Ubuntu 14.04
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cd005c3d1d7..adc0a509490 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12014-09-23 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2014-09-11 fcntl-h: fix compilation with Intel C++ compiler
5 2014-09-04 pthread, pthread_sigmask, threadlib: port to Ubuntu 14.04
6
12014-09-22 Jan Djärv <jan.h.d@swipnet.se> 72014-09-22 Jan Djärv <jan.h.d@swipnet.se>
2 8
3 * configure.ac: Increase headerpad_extra to 1000, update the comment 9 * configure.ac: Increase headerpad_extra to 1000, update the comment