OSDN Git Service

(root) / android-x86 / hardware-intel-common-vaapi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 09ecfda e4fd418)
Merge branch 'master-fd.o'
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)
commit214be7e5518b4165244d7227e8e6f4fd18b4e049
treec5b134ccec899707216beebbae211652f61272a6tree | snapshot
parent09ecfda174c3076e5230d8c5ddf2d2229f1c8d94commit | diff
parente4fd418a5338fc9b7dbcc09a9ee0ed190d04733ecommit | 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>
hardware/intel/common/vaapi
About OSDN
Find Software
Develop Software
Help