summaryrefslogtreecommitdiff
path: root/src/mesa/sources.mak
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-09-11 06:09:05 +1000
committerBen Skeggs <skeggsb@gmail.com>2008-09-11 06:09:05 +1000
commit7158203b081ad34c03382f07e0df748eae235e9b (patch)
treeee61efebbafb5464ec090c21b5e05533588789a1 /src/mesa/sources.mak
parent02025148c28d03d644e3d66dde1a423fe21e1c44 (diff)
parenteb5b16d278e0f7ee0121049e43dfee1d52f2b0f7 (diff)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts: configs/default
Diffstat (limited to 'src/mesa/sources.mak')
-rw-r--r--src/mesa/sources.mak1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 0e0e10979b..14fd8597a8 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -187,6 +187,7 @@ STATETRACKER_SOURCES = \
state_tracker/st_cb_bufferobjects.c \
state_tracker/st_cb_clear.c \
state_tracker/st_cb_flush.c \
+ state_tracker/st_cb_get.c \
state_tracker/st_cb_drawpixels.c \
state_tracker/st_cb_fbo.c \
state_tracker/st_cb_feedback.c \