Merge remote-tracking branch 'bnf/surface-frame-event'
authorKristian Høgsberg <krh@bitplanet.net>
Mon, 11 Apr 2011 20:40:48 +0000 (16:40 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Mon, 11 Apr 2011 20:40:48 +0000 (16:40 -0400)
commit4378a80b083f6ad3c5a3eaadd6f55eb14740dbbf
tree2363fda07fe6f94275ee76e4c5b2deacd5b33ab7
parent7cfcdc610db4c5ef57ea282bff8b2a5406ac3662
parent94fcdde0e25ffb737734e9a696814308bcb23576
Merge remote-tracking branch 'bnf/surface-frame-event'
wayland/wayland-client.c
wayland/wayland-server.c
wayland/wayland-server.h