diff options
Diffstat (limited to 'src/mesa/main/sources')
| -rw-r--r-- | src/mesa/main/sources | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/sources b/src/mesa/main/sources index eb8cd900ee..6a165f1ae2 100644 --- 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 \ |