projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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 468121bd1dcc5ac91c27052d5d8b84e24ad6dc8d..6a165f1ae26656b566ace2d676e09cc78933a4d5 100644
(file)
--- 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 \