OSDN Git Service

Merge branch 'v1.7-branch' into fdo--master
authorXiang, Haihao <haihao.xiang@intel.com>
Mon, 19 Sep 2016 06:00:41 +0000 (14:00 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Mon, 19 Sep 2016 06:00:41 +0000 (14:00 +0800)
commit2ea2088b5dc315a2331503bd9827623f4552f8c9
tree0bce38f6c13fc2fafb3c55b2918ec362c819333c
parent7aa2dd979a3758e1f6378344b235595c5028a9e7
parent6a9ab53720247effd2ff49eac2f7b5b37afc6f62
Merge branch 'v1.7-branch' into fdo--master

Conflicts:
configure.ac