summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2011-07-04 10:21:35 +0200
committerThomas Hellstrom <thellstrom@vmware.com>2011-07-04 10:21:35 +0200
commit424b1210d951c206e7c2fb8f2778acbd384eb247 (patch)
tree964884074e08de8072ef535ff5f2ee5f2c416b61 /src/mesa
parenta221807dc5d69598afd1d0e0a4e715fb82a9f30d (diff)
parentf81ac1840a25ad39a9d7e46e4951e5eb45a05971 (diff)
Merge branch 'xa_branch'
Conflicts: configure.ac Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'src/mesa')
0 files changed, 0 insertions, 0 deletions