Merge branch 'register-negate'

author Brian Paul <brianp@vmware.com>

Fri, 17 Apr 2009 04:02:54 +0000 (22:02 -0600)

committer Brian Paul <brianp@vmware.com>

Fri, 17 Apr 2009 04:02:54 +0000 (22:02 -0600)
author Brian Paul <brianp@vmware.com>
Fri, 17 Apr 2009 04:02:54 +0000 (22:02 -0600)
committer Brian Paul <brianp@vmware.com>
Fri, 17 Apr 2009 04:02:54 +0000 (22:02 -0600)
diff --cc src/mesa/drivers/dri/i915/i915_fragprog.c
Simple merge
diff --cc src/mesa/drivers/dri/i965/brw_vs_emit.c
Simple merge
diff --cc src/mesa/drivers/dri/i965/brw_wm_glsl.c
Simple merge
author	Brian Paul <brianp@vmware.com>
	Fri, 17 Apr 2009 04:02:54 +0000 (22:02 -0600)
committer	Brian Paul <brianp@vmware.com>
	Fri, 17 Apr 2009 04:02:54 +0000 (22:02 -0600)
		1	2
src/mesa/drivers/dri/i915/i915_fragprog.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_vs_emit.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i965/brw_wm_glsl.c	patch \|	diff1 \|	diff2 \|	blob \| history