OSDN Git Service

Merge branch 'v1.6-branch' into fdo--master
authorXiang, Haihao <haihao.xiang@intel.com>
Thu, 10 Sep 2015 05:57:23 +0000 (13:57 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Thu, 10 Sep 2015 05:57:23 +0000 (13:57 +0800)
commitcbe709aab6fd857513a03b5c66ff11fded8e35dc
tree34350488322a5dfcb68632088a851ddcba42da08
parent575be3f0b5868f842b12473fe21ceab72360cde0
parent613eb962b45fbbd1526d751e88e0d8897af6c0e0
Merge branch 'v1.6-branch' into fdo--master

Conflicts:
configure.ac