diff options
author | Keith Whitwell <[email protected]> | 2009-02-10 19:22:57 +0000 |
---|---|---|
committer | Keith Whitwell <[email protected]> | 2009-02-10 19:22:57 +0000 |
commit | 9c9ba66fbae8089e9423f6b09ad1091cccf9b006 (patch) | |
tree | 81ecce3d6b19e5b77fcf31e5f081e1c546f398b9 /src/gallium/drivers/softpipe/sp_query.c | |
parent | ebb864da9e98003be9ea388013ae4385d341e46f (diff) | |
parent | 1e8177ee178b131afa86d874b062a8ae3fae0cca (diff) |
Merge commit 'origin/gallium-0.2' into gallium-0.2
Conflicts:
src/gallium/state_trackers/wgl/icd/stw_icd.c
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_query.c')
0 files changed, 0 insertions, 0 deletions