[Chinese-commits] [manpages-zh] 26/31: Merge branch 'upstream'

[Boyuan Yang]

This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository manpages-zh.

commit 279812491cd3ddd9408b5bcb59e3562f8a4ed9a9
Merge: 012e7c4 78209b4
Author: Boyuan Yang <073plan at gmail.com>
Date:   Fri Dec 23 00:20:25 2016 +0800

    Merge branch 'upstream'

 ChangeLog                  |  7 ++++++-
 README.md                  |  4 +---
 TODO                       |  8 ++++----
 configure.ac               | 45 ++++++++++++---------------------------------
 src/man1/zh_CN/Makefile.am |  7 +------
 src/man1/zh_TW/Makefile.am |  7 +------
 src/man2/zh_CN/Makefile.am |  7 +------
 src/man2/zh_TW/Makefile.am |  7 +------
 src/man3/zh_CN/Makefile.am |  7 +------
 src/man3/zh_TW/Makefile.am |  7 +------
 src/man4/zh_CN/Makefile.am |  7 +------
 src/man4/zh_TW/Makefile.am |  7 +------
 src/man5/zh_CN/Makefile.am |  7 +------
 src/man5/zh_TW/Makefile.am |  7 +------
 src/man6/zh_CN/Makefile.am |  7 +------
 src/man6/zh_TW/Makefile.am |  7 +------
 src/man7/zh_CN/Makefile.am |  7 +------
 src/man7/zh_TW/Makefile.am |  7 +------
 src/man8/zh_CN/Makefile.am |  7 +------
 src/man8/zh_TW/Makefile.am |  7 +------
 src/mann/zh_CN/Makefile.am | 11 ++---------
 src/mann/zh_TW/Makefile.am | 11 ++---------
 22 files changed, 43 insertions(+), 155 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/manpages-zh.git