Merge branch 'master' of git://anongit.freedesktop.org/wayland
authorCallum Lowcay <callum@callumscode.com>
Mon, 10 Jan 2011 20:08:59 +0000 (09:08 +1300)
committerCallum Lowcay <callum@callumscode.com>
Mon, 10 Jan 2011 20:08:59 +0000 (09:08 +1300)
1  2 
clients/terminal.c

Simple merge