diff options
| author | Eric Anholt <eric@anholt.net> | 2010-07-26 17:47:59 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-07-26 17:53:27 -0700 |
| commit | afe125e0a18ac3886c45c7e6b02b122fb2d327b5 (patch) | |
| tree | 78621707e71154c0b388b0baacffc26432b7e992 /src/glut/glx/Makefile | |
| parent | d64343f1ae84979bd154475badf11af8a9bfc2eb (diff) | |
| parent | 5403ca79b225605c79f49866a6497c97da53be3b (diff) | |
Merge remote branch 'origin/master' into glsl2
This pulls in multiple i965 driver fixes which will help ensure better
testing coverage during development, and also gets past the conflicts
of the src/mesa/shader -> src/mesa/program move.
Conflicts:
src/mesa/Makefile
src/mesa/main/shaderapi.c
src/mesa/main/shaderobj.h
Diffstat (limited to 'src/glut/glx/Makefile')
| -rw-r--r-- | src/glut/glx/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile index 6889cd4b40..69f8052c09 100644 --- a/src/glut/glx/Makefile +++ b/src/glut/glx/Makefile @@ -137,4 +137,4 @@ depend: $(SOURCES) @ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \ $(X11_INCLUDES) > /dev/null -include depend +-include depend |