Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 22:27:52 +0000 (00:27 +0200)
committermirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 22:27:52 +0000 (00:27 +0200)
1  2 
configure.in
lib/Makefile.am
src/buffer.c

diff --cc configure.in
@@@ -15,12 -17,10 +15,12 @@@ but WITHOUT ANY WARRANTY; without even 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.])
  
- AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirDebian-17],
 -AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirOS-0AB7.4],
 -      [miros-discuss@mirbsd.org],[cvs])
++AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirDebian-18],
 +      [bug-cvs@nongnu.org],[cvs])
  AC_CONFIG_SRCDIR(src/cvs.h)
 +AC_CONFIG_AUX_DIR(build-aux)
  AM_INIT_AUTOMAKE([gnu 1.9.2 dist-bzip2 no-define])
 +AM_GNU_GETTEXT_VERSION([0.14.4])
  AC_PREREQ(2.59)
  
  AC_PREFIX_PROGRAM(cvs)
diff --cc lib/Makefile.am
Simple merge
diff --cc src/buffer.c
Simple merge