Merging -r 859:865 branches/0.2/ with trunk
authorMarcus Eggenberger <egs@quassel-irc.org>
Fri, 30 May 2008 11:38:28 +0000 (11:38 +0000)
committerMarcus Eggenberger <egs@quassel-irc.org>
Fri, 30 May 2008 11:38:28 +0000 (11:38 +0000)
commit72f1a93311815cc637358f52046a4cf311bbd9f4
treed2de953bf3a0045f7f8cb94e6ae9928ae9a72431
parent0f2de52ddceb138686d2f53c694531744d70f596
Merging -r 859:865 branches/0.2/ with trunk
src/common/bufferviewconfig.cpp
src/common/bufferviewconfig.h
src/uisupport/bufferviewfilter.cpp
src/uisupport/bufferviewfilter.h
version.inc