Ian Romanick 8fd4e4dfc3 Fix merge fail ...

One of the conflicst from this merge was missed:

commit 0c309bb494
Merge: c6c44bf d27d659
Author: Brian Paul <brianp@vmware.com>
Date:   Wed Sep 9 08:33:39 2009 -0600

2009-09-10 11:47:24 -07:00

..

driclient

g3dvl: Fix some memory leaks.

2009-01-10 13:52:06 -05:00

egl

egl: Remove Xdpy from EGLDisplay.

2009-08-26 16:40:22 -06:00

gallium

tgsi: use new tgsi_call_record to handle execution mask stacks

2009-09-10 12:45:27 -06:00

glew

glew: correct misspelling of glFramebufferTextureLayer

2009-06-18 10:13:55 +01:00

glu

Use separate $(MINSTALL) for installing libraries

2009-06-01 06:32:52 -07:00

glut

glut: fix incorrect Vista maximisation size due to WM_GETMINMAXINFO handling

2009-08-11 08:54:25 -06:00

glw

Use separate $(MINSTALL) for installing libraries

2009-06-01 06:32:52 -07:00

glx

Merge branch 'mesa_7_5_branch'

2009-08-30 13:06:18 +02:00

mesa

Fix merge fail

2009-09-10 11:47:24 -07:00

xvmc

g3dvl: Return BadAlloc if we can't create an XvMC surface.

2009-01-18 21:40:10 -05:00

Makefile

Create $(TOP)/$(LIB_DIR) for install, too

2008-06-23 08:14:49 -06:00

SConscript

glew: Initial import.

2009-01-23 12:32:35 +00:00