review.tizen.org Git - platform/upstream/xorg-server.git/commit

projects / platform / upstream / xorg-server.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 386e4d7 ea1d76d)

author	Keith Packard <keithp@keithp.com>
	Wed, 19 Dec 2012 20:21:31 +0000 (12:21 -0800)
committer	Keith Packard <keithp@keithp.com>
	Wed, 19 Dec 2012 20:22:03 +0000 (12:22 -0800)
commit	0eb1559eb29d11e63c2b33e317590a88d86fe313
tree	6d5956d8dd1ad6f87cd3b410c6a6049c1981004a	tree \| snapshot
parent	386e4d76baaffe226d2d561ff936509454eb0ac2	commit \| diff
parent	ea1d76d1b68c7cbcedcaa1f967c5027e0cc1c7a2	commit \| diff

Merge remote-tracking branch 'yselkowitz/master'

I checked this patch with diff -w to check that it only affected
whitespace.

Xi/extinit.c	diff1 \|	diff2 \|	blob \| history
Xi/xichangehierarchy.c	diff1 \|	diff2 \|	blob \| history
dix/eventconvert.c	diff1 \|	diff2 \|	blob \| history
test/xi2/protocol-eventconvert.c	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / X Window System;