aboutsummaryrefslogtreecommitdiffstats
path: root/progs/xdemos/glxgears.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-06-16 18:25:52 -0600
committerBrian Paul <[email protected]>2009-06-16 18:25:52 -0600
commit8d482227915552c414e13743652e6794c4313ae2 (patch)
tree27bb35b40ec242836320180370d7fd5fa3820f41 /progs/xdemos/glxgears.c
parent4ef1f8e3b52a06fcf58f78c9c36738531b91dbac (diff)
parent6b917d0b1787280f976c2f0d1ead0e5d7587a3e9 (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: src/mesa/main/api_validate.c
Diffstat (limited to 'progs/xdemos/glxgears.c')
0 files changed, 0 insertions, 0 deletions