Kristian Høgsberg 0870e4a202 Merge branch 'gles2-2' ...

Conflicts:
	src/mesa/drivers/dri/common/dri_util.h

2010-05-02 10:17:07 -04:00

..

dri_interface.h

Merge branch 'gles2-2'

2010-05-02 10:17:07 -04:00

glcore.h

dri_interface: Introduce DRI tokens for the texBuffer texture formats

2010-02-09 15:55:25 -05:00

sarea.h

Remove CVS keywords.

2008-05-26 20:14:40 +09:00