Merge branch 'master' into gallium-0.2

[mesa.git] / src / mesa / main / sources

diff --git a/src/mesa/main/sources b/src/mesa/main/sources
index eb8cd900ee5c3b837a529fbf61c668b3da10ecf8..6a165f1ae26656b566ace2d676e09cc78933a4d5 100644 (file)
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@ -78,7 +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 \