[Chinese-commits] [manpages-zh] 125/131: Merge branch 'master' into dev

[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 3071b91ba018e3cc1ac12bbdb456ee6055136a47
Merge: f83e633 f33c7be
Author: Boyuan Yang <073plan at gmail.com>
Date:   Wed Dec 14 02:37:29 2016 +0800

    Merge branch 'master' into dev

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc configure.ac
index 635d88d,3a2e19c..2f03290
--- a/configure.ac
+++ b/configure.ac
@@@ -2,9 -2,8 +2,9 @@@
  # Process this file with autoconf to produce a configure script.
  
  AC_PREREQ([2.61])
 -AC_INIT([manpages-zh],[1.5.2],[https://github.com/lidaobing/manpages-zh/issues])
 -AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
 +AC_INIT([manpages-zh],[1.5.4],[https://github.com/man-pages-zh/manpages-zh/issues])
 +AC_CONFIG_SRCDIR([src/man1/basename.1])
- AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([subdir-objects]）
  AM_MAINTAINER_MODE
  
  AC_ARG_ENABLE([utf8],

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