Merge branch 'master' of git://anongit.freedesktop.org/~peterh/libxcb
authorPeter Harris <pharris@opentext.com>
Thu, 23 Dec 2010 18:04:40 +0000 (13:04 -0500)
committerPeter Harris <pharris@opentext.com>
Thu, 23 Dec 2010 18:04:40 +0000 (13:04 -0500)
1  2 
src/xcb_util.c
src/xcbext.h

diff --cc src/xcb_util.c
Simple merge
diff --cc src/xcbext.h
Simple merge