Merge branch 'master' of git://anongit.freedesktop.org/wayland
authorCallum Lowcay <callum@callumscode.com>
Fri, 21 Jan 2011 23:00:48 +0000 (12:00 +1300)
committerCallum Lowcay <callum@callumscode.com>
Fri, 21 Jan 2011 23:00:48 +0000 (12:00 +1300)
commit6eeeb30021a9f72636887a529bb5772930cd190e
tree4803c7b746ce754ed31751b63a2d2e186eca7d7d
parentef57a9b78884e19f353b1b9173275de28c80157e
parente164e4ef722433b87c98f32a39e93dbd55b2231f
Merge branch 'master' of git://anongit.freedesktop.org/wayland

Conflicts:
clients/window.h
clients/terminal.c
clients/window.c
clients/window.h