git.oblomov.eu Git - nouveau/commit

projects / nouveau / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bc2c272 bb20175)

author	Ben Skeggs <skeggsb@gmail.com>
	Sun, 26 Oct 2008 13:04:37 +0000 (00:04 +1100)
committer	Ben Skeggs <skeggsb@gmail.com>
	Sun, 26 Oct 2008 13:04:37 +0000 (00:04 +1100)
commit	37dc9426ebab81262c1da725c10ac824d89429f7
tree	ab8f7d3b6d2692dad197ee5374c967375f5e1362	tree \| snapshot
parent	bc2c2728b030cb91661af36a2406d1999cf8d632	commit \| diff
parent	bb20175001748e5d2fab1b9cb2075bbe5d94e5ed	commit \| diff

Merge remote branch 'origin/master' into ng

Conflicts:
src/nouveau_channel.c
src/nouveau_device.c
src/nouveau_xv.c
src/nv30_shaders.c
src/nv_crtc.c
src/nv_driver.c

configure.ac	diff1 \|	diff2 \|	blob \| history
src/nouveau_xv.c	diff1 \|	diff2 \|	blob \| history
src/nv30_exa.c	diff1 \|	diff2 \|	blob \| history
src/nv30_xv_tex.c	diff1 \|	diff2 \|	blob \| history
src/nv40_exa.c	diff1 \|	diff2 \|	blob \| history
src/nv40_xv_tex.c	diff1 \|	diff2 \|	blob \| history
src/nv_accel_common.c	diff1 \|	diff2 \|	blob \| history
src/nv_crtc.c	diff1 \|	diff2 \|	blob \| history
src/nv_dri.c	diff1 \|	diff2 \|	blob \| history
src/nv_driver.c	diff1 \|	diff2 \|	blob \| history
src/nv_type.h	diff1 \|	diff2 \|	blob \| history

nouveau + custom patches