aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2015-01-01 11:05:24 -0800
committerPaul Eggert2015-01-01 11:06:53 -0800
commit035f5aaa91ebd40598e0d89881bbc3cf532440a0 (patch)
tree31ffe1ccf1bad659893cdb2c1f06cc70e7d15bf2 /ChangeLog
parent6ddd819467d1d9d0e78f13e5a15c1af9125ae67b (diff)
downloademacs-035f5aaa91ebd40598e0d89881bbc3cf532440a0.tar.gz
emacs-035f5aaa91ebd40598e0d89881bbc3cf532440a0.zip
Merge from gnulib, incorporating:
2015-01-01 version-etc: new year
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f04b60ef537..73bac439d2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
12015-01-01 Paul Eggert <eggert@cs.ucla.edu> 12015-01-01 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Merge from gnulib, incorporating:
4 2015-01-01 version-etc: new year
5
3 * .gitattributes: New file. 6 * .gitattributes: New file.
4 7
52015-01-01 Paul Eggert <eggert@cs.ucla.edu> 82015-01-01 Paul Eggert <eggert@cs.ucla.edu>