commit ce1960eec8d94d0badb7ede2f80c5dd4829640e2
author Xiang, Haihao <haihao.xiang@intel.com> Tue Oct 24 15:17:15 2017 +0800
committer Xiang, Haihao <haihao.xiang@intel.com> Tue Oct 24 15:23:28 2017 +0800
tree 8b3561a37c8db77e230c8e3028b27ebbb4d4051b
parent cb1f254ec65954ff7585f40df4b38337c462b14c
parent 24cbd05c9477ab59cc5665989026b4ad17e06eb6

Merge branch 'v2.0-branch' into master

Conflicts:
	configure.ac

configure.ac

diff --git a/configure.ac b/configure.ac
index e5c18a0..ad53d0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,8 +42,8 @@
 # - reset micro version to zero when VA-API major or minor version is changed
 m4_define([libva_major_version], [m4_eval(va_api_major_version + 1)])
 m4_define([libva_minor_version], [m4_eval(va_api_minor_version)])
-m4_define([libva_micro_version], [0])
-m4_define([libva_pre_version],   [0])
+m4_define([libva_micro_version], [1])
+m4_define([libva_pre_version],   [1])
 
 m4_define([libva_version],
           [libva_major_version.libva_minor_version.libva_micro_version])