Merge branch 'gsoc2010' of git://anongit.freedesktop.org/~chr/xcb_proto
authorPeter Harris <pharris@opentext.com>
Wed, 8 Sep 2010 18:35:32 +0000 (14:35 -0400)
committerPeter Harris <pharris@opentext.com>
Wed, 8 Sep 2010 18:38:24 +0000 (14:38 -0400)
commit9da6ea6269f91602293ad2a4ebccceafa35123f4
tree6c0d09c6752a650158b6db679e8f570808c0e3c2
parente7aa34e6b3d846d0508ef08e74ea95d86da047d0
parent76ca2c0b1527541be59c344118c538ba055ad9d8
Merge branch 'gsoc2010' of git://anongit.freedesktop.org/~chr/xcb_proto

Signed-off-by: Peter Harris <pharris@opentext.com>