projects
/
profile
/
ivi
/
libva.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fb431c2
2822d02
)
Merge branch 'master-fd.o'
62/462/1
author
Austin Yuan
<shengquan.yuan@intel.com>
Fri, 28 Aug 2009 09:33:21 +0000
(17:33 +0800)
committer
Austin Yuan
<shengquan.yuan@intel.com>
Fri, 28 Aug 2009 09:33:21 +0000
(17:33 +0800)
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>
Trivial merge