summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/version.h
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2009-11-30 17:47:07 -0800
committerIan Romanick <[email protected]>2009-11-30 17:47:07 -0800
commit650e02003fbb5511ec758d993b7ec0a302ee2235 (patch)
tree96ff849518962856e51b2e3a26b78ba008b2f9ad /src/mesa/main/version.h
parent270d36da146b899d39e08f830fe34b63833a3731 (diff)
parent587a52e95bbe96788e8b96b63f091bb3022fc048 (diff)
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
Diffstat (limited to 'src/mesa/main/version.h')
0 files changed, 0 insertions, 0 deletions