summaryrefslogtreecommitdiffstats
path: root/acinclude.m4
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2009-12-02 14:52:51 +0100
committerJakob Bornecrantz <[email protected]>2009-12-02 14:52:51 +0100
commit0c75854cc1650dc870e042aa66a053e70b3d4556 (patch)
tree72eb2c040bd10b6210bdc7f2b25df5e8c405095f /acinclude.m4
parent4598942b1b88a2a7d5af7febae7e79eedf00e385 (diff)
parent2b5618fc5bdcbee3434f8b5aa3a31eb06fb479c0 (diff)
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts: src/mesa/main/version.h
Diffstat (limited to 'acinclude.m4')
0 files changed, 0 insertions, 0 deletions