Merge branch '3.1-rc'

This commit is contained in:
Nicholas Marriott
2020-04-01 09:30:12 +01:00
2 changed files with 6 additions and 0 deletions

View File

@ -1,6 +1,10 @@
# configure.ac
<<<<<<< HEAD
AC_INIT([tmux], next-3.2)
=======
AC_INIT([tmux], 3.1-rc3)
>>>>>>> 3.1-rc
AC_PREREQ([2.60])
AC_CONFIG_AUX_DIR(etc)