Merging r812:820 from trunk to branches/0.3.
authorManuel Nickschas <sputnick@quassel-irc.org>
Thu, 8 May 2008 09:45:30 +0000 (09:45 +0000)
committerManuel Nickschas <sputnick@quassel-irc.org>
Thu, 8 May 2008 09:45:30 +0000 (09:45 +0000)
commita14eac175cceda16f50cb4519182f819cf7f6b23
treec6103be15ba0771d6c93fd9f5eca85adaf31520c
parentaefcf3c3799a9deb286723eccc124760ce4d898d
Merging r812:820 from trunk to branches/0.3.
src/common/signalproxy.h
src/core/core.pri
src/core/sslserver.cpp
src/core/sslserver.h
src/uisupport/bufferview.cpp
src/uisupport/bufferview.h
src/uisupport/bufferviewfilter.cpp
version.inc