summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
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 @@
2015-01-01 Paul Eggert <eggert@cs.ucla.edu>
+ Merge from gnulib, incorporating:
+ 2015-01-01 version-etc: new year
+
* .gitattributes: New file.
2015-01-01 Paul Eggert <eggert@cs.ucla.edu>