fixing some merge weirdness
authorMarcus Eggenberger <egs@quassel-irc.org>
Mon, 23 Jun 2008 11:30:23 +0000 (13:30 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Mon, 23 Jun 2008 11:30:23 +0000 (13:30 +0200)
commit07171f8337e7236c3ac3432352b41ad3c53e077b
treeace78ecc88ebe9f495a993ae5ae2c6d2d7c733f1
parent52a7b4d0f289f075aa386445a47d876743bcb6d0
fixing some merge weirdness
src/client/client.cpp
src/core/networkconnection.cpp
src/core/networkconnection.h