Merge branch 'network-sync'
authorMarcus Eggenberger <egs@quassel-irc.org>
Sat, 12 Jul 2008 13:21:49 +0000 (15:21 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Sat, 12 Jul 2008 13:21:49 +0000 (15:21 +0200)
commita33e42aee121185f479667b2104a15fc2033762e
treea71ec8b9e0cab941578c15c1063d7cbbc176e619
parent3439fc6d10d49edb1af23fd2f4ebb688692475d7
parent671e451cf1c10a6e3f442af82b58bfc4de0cb5a2
Merge branch 'network-sync'
src/client/networkmodel.cpp
src/common/network.cpp
src/common/network.h