| commit | c3b2230b71cb3a00a7f4c0987197d397bada650b | [log] [tgz] |
|---|---|---|
| author | Christian König <deathsimple@vodafone.de> | Mon Jul 04 15:04:41 2011 +0200 |
| committer | Christian König <deathsimple@vodafone.de> | Mon Jul 04 15:04:41 2011 +0200 |
| tree | 018f5df0f8b5976ddb56ef4f13e9466587838998 | |
| parent | 003401f95c9b59471c22368b7da16fe7a951e490 [diff] | |
| parent | 424b1210d951c206e7c2fb8f2778acbd384eb247 [diff] |
Merge remote-tracking branch 'origin/master' into pipe-video Conflicts: configure.ac src/gallium/drivers/r600/r600_state_inlines.h src/gallium/tests/trivial/Makefile src/gallium/winsys/g3dvl/dri/XF86dri.c src/gallium/winsys/g3dvl/dri/driclient.c src/gallium/winsys/g3dvl/dri/driclient.h src/gallium/winsys/g3dvl/dri/xf86dri.h src/gallium/winsys/g3dvl/dri/xf86dristr.h src/gallium/winsys/r600/drm/r600_bo.c