| commit | 49d2ed00daea7cc22234bbc01efe66f313357a6c | [log] [tgz] |
|---|---|---|
| author | Austin Yuan <shengquan.yuan@intel.com> | Mon Nov 23 16:22:34 2009 +0800 |
| committer | Austin Yuan <shengquan.yuan@intel.com> | Mon Nov 23 16:22:34 2009 +0800 |
| tree | 63f60a7b7d4409df98eb9f09627b6274eea693bc | |
| parent | f726572648d8310d9671e2f24c57f35fcacb93b7 [diff] | |
| parent | 59575183a502c3f872f48c9099f1a0c6eb670193 [diff] |
Merge branch 'master' into local-branch-testing-alpha2 Conflicts: src/va.c src/x11/va_x11.c Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>