OSDN Git Service

Merge branch 'v2.0-branch' into master
authorXiang, Haihao <haihao.xiang@intel.com>
Tue, 24 Oct 2017 07:19:39 +0000 (15:19 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Tue, 24 Oct 2017 07:22:14 +0000 (15:22 +0800)
commit49976650aeac44f7fc638dc6496867b1bafa43d1
treeb81e852a01a862b4170222a4edcd5d18bb16b958
parent3bee13d2ecf8b64bca21bbfec15e52c7a94a5428
parentcaca038ab7c348d1bbadfd411587735112da9aa4
Merge branch 'v2.0-branch' into master

Conflicts:
configure.ac