Merge branch 'gallium-wgl-rework' into gallium-0.2
authorKeith Whitwell <keithw@vmware.com>
Mon, 2 Feb 2009 12:17:01 +0000 (12:17 +0000)
committerKeith Whitwell <keithw@vmware.com>
Mon, 2 Feb 2009 12:17:01 +0000 (12:17 +0000)
commite4d1757f81323636e99abc5fff411d42e19e901a
tree4fd889e01445ce7c79688fa51dc78e9ad97be8c4
parent59edbc70cd1042a884e7d153ba547c2f7f87318d
parenta38b8213ff1b99b73aae884e7b90be3d1999e3bf
Merge branch 'gallium-wgl-rework' into gallium-0.2

Conflicts:

src/gallium/state_trackers/wgl/shared/stw_public.h
src/gallium/state_trackers/wgl/shared/stw_device.c
src/gallium/state_trackers/wgl/shared/stw_framebuffer.c
src/gallium/state_trackers/wgl/shared/stw_winsys.h