aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d7fd76cd305..ca9f44aacf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12015-02-04 Paul Eggert <eggert@cs.ucla.edu>
2
3 * .gitattributes: Ignore blanks at EOL in texinfo.tex.
4
12015-01-28 Paul Eggert <eggert@cs.ucla.edu> 52015-01-28 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Merge from gnulib and try to repair bad merge 7 Merge from gnulib and try to repair bad merge