Merging branches/0.2/@r859 with trunk
authorMarcus Eggenberger <egs@quassel-irc.org>
Mon, 26 May 2008 15:21:58 +0000 (15:21 +0000)
committerMarcus Eggenberger <egs@quassel-irc.org>
Mon, 26 May 2008 15:21:58 +0000 (15:21 +0000)
commita1bcca1c86e88406a0c5495b08731e6b11dd987e
tree7244f7827d52e7448c4cf6ef0f38a0ab3a7f37e2
parentc79539bee8761bcabe057d8d72594d16da24528f
Merging branches/0.2/@r859 with trunk
src/common/bufferviewconfig.cpp
src/common/bufferviewconfig.h
src/core/corebufferviewconfig.h
src/uisupport/bufferview.cpp
src/uisupport/bufferview.h
src/uisupport/bufferviewfilter.cpp
src/uisupport/bufferviewfilter.h
version.inc