From: Austin Yuan <shengquan.yuan@intel.com>
Date: Fri, 28 Aug 2009 09:33:21 +0000 (+0800)
Subject: Merge branch 'master-fd.o'
X-Git-Tag: ww36.4-video~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7dbd4e05ab1f30d7f020ff0b25d8f1948924f91;p=platform%2Fupstream%2Flibva.git

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>
---

a7dbd4e05ab1f30d7f020ff0b25d8f1948924f91