From: Peter Harris Date: Wed, 8 Sep 2010 18:35:32 +0000 (-0400) Subject: Merge branch 'gsoc2010' of git://anongit.freedesktop.org/~chr/xcb_proto X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9da6ea6269f91602293ad2a4ebccceafa35123f4;p=free-sw%2Fxcb%2Fproto Merge branch 'gsoc2010' of git://anongit.freedesktop.org/~chr/xcb_proto Signed-off-by: Peter Harris --- 9da6ea6269f91602293ad2a4ebccceafa35123f4