From: Peter Harris <pharris@opentext.com>
Date: Tue, 31 Aug 2010 22:33:36 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/topcat/xcb-win32
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20da10490f8dac75ec9fe1df28cb9e862e171be5;hp=20da10490f8dac75ec9fe1df28cb9e862e171be5;p=free-sw%2Fxcb%2Flibxcb

Merge branch 'master' of git://github.com/topcat/xcb-win32

Conflicts:
	src/xcb_conn.c
	src/xcb_util.c

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