Merge branch 'master' of git://github.com/topcat/xcb-win32
authorPeter Harris <pharris@opentext.com>
Tue, 31 Aug 2010 22:33:36 +0000 (18:33 -0400)
committerPeter Harris <pharris@opentext.com>
Tue, 31 Aug 2010 22:35:20 +0000 (18:35 -0400)
Conflicts:
src/xcb_conn.c
src/xcb_util.c

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

No differences found