OSDN Git Service
(root)
/
android-x86
/
hardware-intel-common-libva.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
acbc209
c4f37b5
)
Merge branch 'v1.7-branch' into fdo--master
author
Xiang, Haihao
<haihao.xiang@intel.com>
Mon, 9 Jan 2017 05:28:49 +0000
(13:28 +0800)
committer
Xiang, Haihao
<haihao.xiang@intel.com>
Mon, 9 Jan 2017 05:28:49 +0000
(13:28 +0800)
Conflicts:
configure.ac
va/va.h
Trivial merge