summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorRoland Scheidegger <[email protected]>2010-01-28 17:23:58 +0100
committerRoland Scheidegger <[email protected]>2010-01-28 17:23:58 +0100
commit9b346f83a7b672e913a7bb6a089d5dbd7fbdce06 (patch)
treef5e4856c9d6fb4e57c4ddf6e64d5212f24c853ae /configs
parentbd60e6cd5ce7c19e52338f12f73dfa1b622391d5 (diff)
parent2fa34bf44c7cd7ba03ce8a7e82fe56898a57e9b4 (diff)
Merge commit 'origin/perrtblend'
Conflicts: src/gallium/drivers/softpipe/sp_screen.c src/gallium/include/pipe/p_defines.h
Diffstat (limited to 'configs')
0 files changed, 0 insertions, 0 deletions