summaryrefslogtreecommitdiffstats
path: root/progs/tests/scissor-viewport.c
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2010-03-30 12:01:31 +0200
committerMichel Dänzer <[email protected]>2010-03-30 12:01:31 +0200
commite5c7d1e1c8ccb493c63e33d017c28b5cf4a55829 (patch)
tree0c73ae897b0cfb09ad21e13e27f45bb11b82e75b /progs/tests/scissor-viewport.c
parentaa1a79036003c2aeaae24877da66e9b46a059cad (diff)
parent07c6d94cd7272524ef06b2a787667e5d626137d2 (diff)
Merge branch '7.8'
Conflicts: Makefile src/mesa/main/version.h Resolved by keeping version strings from master (also in the intel driver).
Diffstat (limited to 'progs/tests/scissor-viewport.c')
0 files changed, 0 insertions, 0 deletions