diff options
author | Alan Hourihane <[email protected]> | 2008-12-15 11:22:19 +0000 |
---|---|---|
committer | Alan Hourihane <[email protected]> | 2008-12-15 11:22:19 +0000 |
commit | 8abc860bd46a6cd584f9a64cb4613be76f82db06 (patch) | |
tree | 25b94d69e8ef1198cd45b2d5fc0a6fde196124de /src/mesa/sources.mak | |
parent | a22d865f93a1db7f72e0bfe216810f67bf4c2f2c (diff) | |
parent | 3a5d260cb1d2602b9fc32392f18538d0a6ff41c2 (diff) |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/winsys/gdi/SConscript
Diffstat (limited to 'src/mesa/sources.mak')
-rw-r--r-- | src/mesa/sources.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 14fd8597a8f..9ebac8e1cd1 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -201,6 +201,7 @@ STATETRACKER_SOURCES = \ state_tracker/st_context.c \ state_tracker/st_debug.c \ state_tracker/st_draw.c \ + state_tracker/st_draw_feedback.c \ state_tracker/st_extensions.c \ state_tracker/st_format.c \ state_tracker/st_framebuffer.c \ |