Merge remote branch 'callum/master'
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 25 Jan 2011 15:40:01 +0000 (10:40 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 25 Jan 2011 15:40:01 +0000 (10:40 -0500)
commit6ec41abf72ab04f562cb91d7c44b734c2f184b65
tree4434466bf105b958e00188ea5b1a0c619f803d7f
parent4d6ff297c809be5330f693810cf8e5bac61b238d
parent6eeeb30021a9f72636887a529bb5772930cd190e
Merge remote branch 'callum/master'

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