aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-06-15 15:27:54 -0700
committerPaul Eggert2011-06-15 15:27:54 -0700
commit8aeb5be96aa28c4770299a54758a8fb339993a97 (patch)
treedbf3821be90ab7a043a6552aa9b838a6259677e4 /ChangeLog
parent4bba86e6210a74326e843a8fdc8409127105e1fe (diff)
downloademacs-8aeb5be96aa28c4770299a54758a8fb339993a97.tar.gz
emacs-8aeb5be96aa28c4770299a54758a8fb339993a97.zip
Merge from gnulib: lib/gnulib.mk, m4/*.m4.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c6531ffba3f..f9d1c974359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
12011-06-15 Paul Eggert <eggert@cs.ucla.edu> 12011-06-15 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: Merge from gnulib. 3 * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h:
4 * lib/gnulib.mk, m4/c-strtod.m4, m4/filemode.m4, m4/getloadavg.m4:
5 * m4/getopt.m4, m4/gl-comp.m4, m4/lstat.m4, m4/md5.m4, m4/mktime.m4:
6 * m4/readlink.m4, m4/sha1.m4, m4/stat.m4, m4/strftime.m4:
7 * m4/strtoull.m4, m4/strtoumax.m4, m4/symlink.m4, m4/time_r.m4:
8 Merge from gnulib.
4 9
52011-06-14 Jan Djärv <jan.h.d@swipnet.se> 102011-06-14 Jan Djärv <jan.h.d@swipnet.se>
6 11