OSDN Git Service

Merge branch 'v2.0-branch' into master
authorXiang, Haihao <haihao.xiang@intel.com>
Tue, 24 Oct 2017 07:17:15 +0000 (15:17 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Tue, 24 Oct 2017 07:23:28 +0000 (15:23 +0800)
Conflicts:
configure.ac


Trivial merge