merging branches/0.2/0.2@r44 with trunk
authorMarcus Eggenberger <egs@quassel-irc.org>
Tue, 20 May 2008 20:47:08 +0000 (20:47 +0000)
committerMarcus Eggenberger <egs@quassel-irc.org>
Tue, 20 May 2008 20:47:08 +0000 (20:47 +0000)
commit4fdf00a414eba03fb95cade3aca3ba53705c7b97
tree0d1b706b583da4aa6a1701954d7c86a9a6e0df7a
parent9e0b5872dcf290e375c46c016f951c6ea780fcc0
merging branches/0.2/0.2@r44 with trunk
src/client/networkmodel.h
src/uisupport/bufferview.cpp
src/uisupport/bufferview.h
version.inc