review.tizen.org Git - profile/ivi/libxcb.git/commit

projects / profile / ivi / libxcb.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7f5cfcc 2dcf8b0)

author	Peter Harris <pharris@opentext.com>
	Tue, 31 Aug 2010 22:33:36 +0000 (18:33 -0400)
committer	Peter Harris <pharris@opentext.com>
	Tue, 31 Aug 2010 22:35:20 +0000 (18:35 -0400)
commit	20da10490f8dac75ec9fe1df28cb9e862e171be5
tree	0a0f1f384ad8cb461bb5aa9eb1402de086113ac3	tree \| snapshot
parent	7f5cfcc2fd0168d505504cc088bfdcba5c71f0ea	commit \| diff
parent	2dcf8b025be88a25d4333abdc28d425b88238d96	commit \| diff

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>

src/xcb_auth.c	diff1 \|	diff2 \|	blob \| history
src/xcb_conn.c	diff1 \|	diff2 \|	blob \| history
src/xcb_in.c	diff1 \|	diff2 \|	blob \| history
src/xcb_util.c	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / X Window System;