diff options
| author | Brian Paul <[email protected]> | 2009-01-06 08:15:54 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-01-06 08:15:54 -0700 |
| commit | 374cf77b2f0f13f9380fb0c9d804222a83bdc2e0 (patch) | |
| tree | 39cfbbcbbbdc9b2d64e4ad134472cf747101dc7b /Makefile | |
| parent | 52d5d25537a9291f7d247211d2881ed56edaca94 (diff) | |
| parent | a8ee35c1c59c23938e0a18b163515acc892ed407 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -324,7 +324,7 @@ MAIN_FILES = \ DRI_FILES = \ $(DIRECTORY)/include/GL/internal/dri_interface.h \ - $(DIRECTORY)/include/GL/internal/dri_sarea.h \ + $(DIRECTORY)/include/GL/internal/glcore.h \ $(DIRECTORY)/include/GL/internal/sarea.h \ $(DIRECTORY)/src/glx/Makefile \ $(DIRECTORY)/src/glx/x11/Makefile \ |