Merge branch 'canoe' into vlock-2
commit5367cd1e9eb61a639759b18cd3cb359860d77353
authorFrank Benkstein <frank-vlock@benkstein.net>
Tue, 12 May 2009 20:06:04 +0000 (12 22:06 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Tue, 12 May 2009 20:06:04 +0000 (12 22:06 +0200)
treeac35f605779c0eee5a6f7d864c2c9f3d5384d941
parent439ba9d28c339183e1ce8675244c3d70918ce7a5
parent8cdb79a5c94ed8d89537b9750cdd563db3f1a947
Merge branch 'canoe' into vlock-2
src/vlock-main.c