summaryrefslogtreecommitdiffstats
path: root/progs/trivial/quad-flat.c
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2008-06-23 00:01:17 +1000
committerBen Skeggs <[email protected]>2008-06-23 00:01:17 +1000
commitaa3ab377e6e2e5811cdd704d87c3e24acb5eff72 (patch)
treeab8a443a58a58a6b88f35d4b5730ed1292e44d26 /progs/trivial/quad-flat.c
parent8c26a521ee80f5d8a1d0aabd0910233aad400322 (diff)
parente2c3f06e9649b5b87fc9adbca7d1f07841bba895 (diff)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts: configs/default
Diffstat (limited to 'progs/trivial/quad-flat.c')
0 files changed, 0 insertions, 0 deletions