Merge remote-tracking branch 'bnf/surface-frame-event'

author Kristian Høgsberg <krh@bitplanet.net>

Mon, 11 Apr 2011 20:40:48 +0000 (16:40 -0400)

committer Kristian Høgsberg <krh@bitplanet.net>

Mon, 11 Apr 2011 20:40:48 +0000 (16:40 -0400)
author Kristian Høgsberg <krh@bitplanet.net>
Mon, 11 Apr 2011 20:40:48 +0000 (16:40 -0400)
committer Kristian Høgsberg <krh@bitplanet.net>
Mon, 11 Apr 2011 20:40:48 +0000 (16:40 -0400)
diff --cc wayland/wayland-client.c
Simple merge
diff --cc wayland/wayland-server.c
Simple merge
diff --cc wayland/wayland-server.h
Simple merge
author	Kristian Høgsberg <krh@bitplanet.net>
	Mon, 11 Apr 2011 20:40:48 +0000 (16:40 -0400)
committer	Kristian Høgsberg <krh@bitplanet.net>
	Mon, 11 Apr 2011 20:40:48 +0000 (16:40 -0400)
		1	2
wayland/wayland-client.c	patch \|	diff1 \|	diff2 \|	blob \| history
wayland/wayland-server.c	patch \|	diff1 \|	diff2 \|	blob \| history
wayland/wayland-server.h	patch \|	diff1 \|	diff2 \|	blob \| history