Merge commit 'origin/gallium-0.2' into gallium-0.2
authorKeith Whitwell <keithw@vmware.com>
Tue, 10 Feb 2009 19:22:57 +0000 (19:22 +0000)
committerKeith Whitwell <keithw@vmware.com>
Tue, 10 Feb 2009 19:22:57 +0000 (19:22 +0000)
commit9c9ba66fbae8089e9423f6b09ad1091cccf9b006
tree81ecce3d6b19e5b77fcf31e5f081e1c546f398b9
parentebb864da9e98003be9ea388013ae4385d341e46f
parent1e8177ee178b131afa86d874b062a8ae3fae0cca
Merge commit 'origin/gallium-0.2' into gallium-0.2

Conflicts:

src/gallium/state_trackers/wgl/icd/stw_icd.c
src/gallium/state_trackers/wgl/icd/stw_icd.c