| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/gallium/auxiliary/util/Makefile
	src/gallium/drivers/r300/r300_state_derived.c
 | 
 | 
 | 
 | 
Remove glutInitWindowPosition() calls to play nicer with window managers.
Move glutInitWindowSize() calls before glutInit() so the the default window
size can be overridden by the -geometry cmd line option.
 | 
 | 
Useful for figuring out how much of a perf impact the glBitmap fps
display has on a given driver.
 | 
 | 
 | 
 | 
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
	Makefile
	docs/relnotes-7.4.html
	docs/relnotes.html
	src/mesa/drivers/dri/i965/brw_wm.h
	src/mesa/main/imports.c
	src/mesa/main/mtypes.h
	src/mesa/main/texcompress.c
	src/mesa/main/texenvprogram.c
	src/mesa/main/version.h
	src/mesa/vbo/vbo_exec_api.c
	src/mesa/vbo/vbo_save_draw.c
 | 
 | 
 | 
 | 
A couple of test weren't ported due to glew breakage -- it undefines
GLAPIENTRY.
 | 
 | 
 | 
 | 
Only set front material colors to make it noticable if front/back-face
determination is incorrect anywhere.
 | 
 | 
 | 
 | 
 |