diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-14 09:42:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-14 09:42:43 +0100 |
| commit | 93795f7d8ca73dd428a926901cbc632015ac0cf5 (patch) | |
| tree | 3fdcae64c6a51d6512aa32387846a2f282439855 /mesalib/src/mesa/sources.mak | |
| parent | 00ea126522f5bbf5c4600ddb93a45b260475c8c1 (diff) | |
| parent | 156e37d3879b316329e3e05579414031da2647e2 (diff) | |
| download | vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.gz vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.bz2 vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/util/makekeys.c
Diffstat (limited to 'mesalib/src/mesa/sources.mak')
| -rw-r--r-- | mesalib/src/mesa/sources.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak index b804a95cc..102562ace 100644 --- a/mesalib/src/mesa/sources.mak +++ b/mesalib/src/mesa/sources.mak @@ -9,7 +9,6 @@ MAIN_SOURCES = \ main/api_arrayelt.c \ main/api_exec.c \ main/api_loopback.c \ - main/api_noop.c \ main/api_validate.c \ main/accum.c \ main/arbprogram.c \ @@ -183,6 +182,7 @@ VBO_SOURCES = \ vbo/vbo_exec_array.c \ vbo/vbo_exec_draw.c \ vbo/vbo_exec_eval.c \ + vbo/vbo_noop.c \ vbo/vbo_rebase.c \ vbo/vbo_split.c \ vbo/vbo_split_copy.c \ |