Merge branch 'master' of pc18:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 14 Feb 2008 06:08:01 +0000 (07:08 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 14 Feb 2008 06:08:01 +0000 (07:08 +0100)
1  2 
daemon/ui.c

diff --cc daemon/ui.c
Simple merge