Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa
authorJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 11 Jan 2010 20:23:29 +0000 (15:23 -0500)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 11 Jan 2010 20:23:29 +0000 (15:23 -0500)
commitc6ef705e414c8e93ee471f50d15ada3492a9b067
tree5b037def16eaa6e58860f7b66d79fd75067a0cb2
parentcca66dbb59673168d57b4e3499ccc31f4ddc86ad
parent7c50d29f7ced3d60e52ee0146d982b49ea421de2
Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa

Conflicts due to DRI1 removal:
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_screen.c
configure.ac
progs/xdemos/glsync.c
src/glx/x11/dri_glx.c
src/glx/x11/glxcmds.c
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/dri_util.h
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/drivers/dri/intel/intel_tex_image.c