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)
commit1b091dd41128d42992bc4cbbd14f195a9c219d2a
tree09ee94ab9cd981b25ae7e981995326ca4e32334f
parent81179db42c2a1d512af41f7ac0bc5998d83875b6
parent5fd89d255b7f4f66ad2b5040919532131750d952
Merge branch 'master' of git://anongit.freedesktop.org/wayland
clients/terminal.c