summaryrefslogtreecommitdiffstats
path: root/src/mesa/descrip.mms
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2008-09-18 18:57:46 +0100
committerKeith Whitwell <[email protected]>2008-09-18 19:03:02 +0100
commit89ab66448e1bcd78caab6678261c2885dcff741c (patch)
treebe36d7e3eba3f64e54da34ff7ba64b3eb14e56aa /src/mesa/descrip.mms
parent1074e8e4e47bb4af73c7ef730d0fec40e826cc7e (diff)
parent5e530d8384b0d9bb867d6407315587c84a443902 (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
Diffstat (limited to 'src/mesa/descrip.mms')
0 files changed, 0 insertions, 0 deletions