summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-06-04 13:16:13 -0600
committerBrian Paul <[email protected]>2009-06-04 13:16:13 -0600
commit9d58724c51c387c360d2423e29b80ddc0bfa66b7 (patch)
tree774f69454bca802e1fe8e20ebb2a130843ca8123 /configure.ac
parent81a0ef3f2068448a8b544826eaa7d3382b9c769b (diff)
parent9424d81d18770f0c436f0876dffe07cf7c094db4 (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: src/mesa/main/context.c
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions