Merge branch 'master' into tablet-support

This commit is contained in:
Peter Hutterer 2015-12-16 08:46:34 +10:00
commit 4b9b221847

View file

@ -2,7 +2,7 @@ AC_PREREQ([2.64])
m4_define([libinput_major_version], [1])
m4_define([libinput_minor_version], [1])
m4_define([libinput_micro_version], [2])
m4_define([libinput_micro_version], [3])
m4_define([libinput_version],
[libinput_major_version.libinput_minor_version.libinput_micro_version])
@ -31,7 +31,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
# b) If interfaces have been changed or added, but binary compatibility has
# been preserved, change to C+1:0:A+1
# c) If the interface is the same as the previous version, change to C:R+1:A
LIBINPUT_LT_VERSION=16:2:6
LIBINPUT_LT_VERSION=16:3:6
AC_SUBST(LIBINPUT_LT_VERSION)
AM_SILENT_RULES([yes])