Merge branch 'master' into next

This commit is contained in:
Alexandre Duret-Lutz 2016-12-16 07:03:18 +01:00
commit 975ec6ff81
3 changed files with 14 additions and 10 deletions

View file

@ -21,7 +21,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.61])
AC_INIT([spot], [2.2.1.dev], [spot@lrde.epita.fr])
AC_INIT([spot], [2.2.2.dev], [spot@lrde.epita.fr])
AC_CONFIG_AUX_DIR([tools])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 gnu tar-ustar color-tests parallel-tests])