summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2017-01-09 13:28:49 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2017-01-09 13:28:49 +0800
commit53f4752fc3253076514e2c24fd3ec93ed771c62b (patch)
tree174446ed8d45d2e036cdcf4ebba9b8c112a68b2e /configure.ac
parentacbc209b9bed133e2feadb74a07d34f8c933dcc0 (diff)
parentc4f37b5dc9f092f68a793c52ea169092f0ad6e44 (diff)
downloadlibva-53f4752fc3253076514e2c24fd3ec93ed771c62b.tar.gz
Merge branch 'v1.7-branch' into fdo--master
Conflicts: configure.ac va/va.h
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions