diff options
| author | Eric Anholt <[email protected]> | 2007-05-18 14:14:12 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2007-05-18 14:14:12 -0700 |
| commit | 1bdee1853627e08894bd267b8f0ec176a1b5978f (patch) | |
| tree | 78c3b8bb81e866de4544d2621abb633b008095ab /progs/demos/tessdemo.c | |
| parent | c085e350df593ab2af60f53b86265db4c3eab38a (diff) | |
| parent | 4fca6bfa5d211a093c54b0bbeadaa38081e8c141 (diff) | |
Merge branch 'master' into i915-unification
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_drmpool.c
src/mesa/drivers/dri/i915tex/intel_batchpool.c
src/mesa/drivers/dri/i915tex/intel_buffer_objects.c
src/mesa/drivers/dri/i915tex/intel_regions.c
src/mesa/drivers/dri/i915tex/intel_screen.c
src/mesa/drivers/dri/i915tex/intel_screen.h
Diffstat (limited to 'progs/demos/tessdemo.c')
| -rw-r--r-- | progs/demos/tessdemo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/demos/tessdemo.c b/progs/demos/tessdemo.c index 26403eee0a2..f71cea12744 100644 --- a/progs/demos/tessdemo.c +++ b/progs/demos/tessdemo.c @@ -4,10 +4,10 @@ * Updated for GLU 1.3 tessellation by Gareth Hughes <[email protected]> */ -#include <GL/glut.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <GL/glut.h> #define MAX_POINTS 256 #define MAX_CONTOURS 32 |