aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2013-01-09 18:19:44 -0800
committerPaul Eggert2013-01-09 18:19:44 -0800
commit6466e676b9e7d102e36f043df92351fe235b82f5 (patch)
tree14a4b884efa0cc1bbee91cc3094760a1b33674af /ChangeLog
parent51fb5578777d1041feaab31651b65e09e1731d33 (diff)
downloademacs-6466e676b9e7d102e36f043df92351fe235b82f5.tar.gz
emacs-6466e676b9e7d102e36f043df92351fe235b82f5.zip
Merge from gnulib.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a6d5148c777..ba756946c56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-01-10 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2013-01-09 stdlib: port to Solaris 2.6
5
12013-01-04 Glenn Morris <rgm@gnu.org> 62013-01-04 Glenn Morris <rgm@gnu.org>
2 7
3 * info/dir: Add htmlfontify. 8 * info/dir: Add htmlfontify.