projects / profile / ivi / libva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb431c2 2822d02)
Merge branch 'master-fd.o' 62/462/1
authorAustin Yuan <shengquan.yuan@intel.com>
Fri, 28 Aug 2009 09:33:21 +0000 (17:33 +0800)
committerAustin Yuan <shengquan.yuan@intel.com>
Fri, 28 Aug 2009 09:33:21 +0000 (17:33 +0800)
commita7dbd4e05ab1f30d7f020ff0b25d8f1948924f91
tree05aac000089bf8d980998d1c046a300fcc421bb7tree | snapshot
parentfb431c22c4aeb593da780faf4f29573e00b01674commit | diff
parent2822d025263d516bd619c8bbe1d17ff4c1bd1af2commit | diff
Merge branch 'master-fd.o'

Conflicts:
Makefile.am
configure.ac
dummy_drv_video/dummy_drv_video.c
i965_drv_video/Makefile.am
i965_drv_video/i965_drv_video.c
src/Makefile.am
src/va.c
src/va.h
src/va_backend.h
src/x11/va_x11.c
test/test_12.c

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>
Domain: Multimedia / Media Content;