diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-21 22:30:55 -0700 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-21 22:30:55 -0700 |
| commit | dace236c5fffa29d59e4d12fa865889bbecbdd24 (patch) | |
| tree | ea6a1d6fde371ad9ebbd7f050de8f35860e56213 /src/mesa/main/sources | |
| parent | e61793a7c01588f2e6235f1271af4c58fa8adad4 (diff) | |
| parent | 6fd15dd80666ccb1e9b99cedd306e32cc7cee989 (diff) | |
Merge branch 'master' into gallium-0.2
Conflicts:
src/mesa/glapi/glapi.h
src/mesa/main/api_exec.c
src/mesa/main/attrib.c
src/mesa/main/clear.c
src/mesa/main/context.c
src/mesa/main/mfeatures.h
src/mesa/main/mipmap.c
src/mesa/main/mipmap.h
src/mesa/main/readpix.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texformat.c
src/mesa/main/texparam.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_context.c
src/mesa/x86/common_x86_asm.S
Diffstat (limited to 'src/mesa/main/sources')
| -rw-r--r-- | src/mesa/main/sources | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/sources b/src/mesa/main/sources index 468121bd1d..6a165f1ae2 100644 --- a/src/mesa/main/sources +++ b/src/mesa/main/sources @@ -78,6 +78,10 @@ vsnprintf.c MESA_MAIN_HEADERS = \ accum.h \ api_arrayelt.h \ +<<<<<<< HEAD:src/mesa/main/sources +======= +api_eval.h \ +>>>>>>> master:src/mesa/main/sources api_exec.h \ api_loopback.h \ api_noop.h \ |