projects / gnulib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3517006 beae0bd)
Merge change up to right before new-year copyright bumping
authorIan Beckwith <ianb@erislabs.net>
Sun, 2 Feb 2014 20:48:41 +0000 (20:48 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 2 Feb 2014 20:48:41 +0000 (20:48 +0000)
Merge commit 'beae0bdcf7fe30f2415c16f6b8c1368d469e519c'

Conflicts:
ChangeLog
build-aux/config.guess
doc/maintain.texi
doc/standards.texi

1  2 
gnulib-tool patch | diff1 | diff2 | blob | history

diff --cc gnulib-tool
Simple merge
gnulib debian + stable branches