Merge branch 'bufferviewoverlay'
authorMarcus Eggenberger <egs@quassel-irc.org>
Tue, 24 Mar 2009 16:36:06 +0000 (17:36 +0100)
committerMarcus Eggenberger <egs@quassel-irc.org>
Tue, 24 Mar 2009 16:36:06 +0000 (17:36 +0100)
commitab16c77fe03b73a863d9b52b11919bcbac903f58
tree67ce8d4983978c94445741adb3477f2734c6471b
parenta99d5f205aeb71c48a94e79992252ba4f2163007
parent7de282e852c2b08c1cb166528a56eeef9d04e348
Merge branch 'bufferviewoverlay'

Conflicts:

src/client/client.cpp
src/client/client.h
src/client/CMakeLists.txt
src/client/client.cpp
src/client/client.h
src/client/messagemodel.cpp
src/qtui/mainwin.cpp