Merging r726:730 from trunk to branches/0.3. This forwardports everything except... 0.3.0-pre
authorManuel Nickschas <sputnick@quassel-irc.org>
Sun, 13 Apr 2008 20:02:30 +0000 (20:02 +0000)
committerManuel Nickschas <sputnick@quassel-irc.org>
Sun, 13 Apr 2008 20:02:30 +0000 (20:02 +0000)
commitad801015af3afad53e0b245afc3a2214373a1b44
treed2e33363d40c064f937dec1aa5ed6a00843b39c4
parent7ad51cd13433398accb26a62e9713ff914d09e5b
Merging r726:730 from trunk to branches/0.3. This forwardports everything except the post-branch cleanups.
quassel.desktop
src/client/networkmodel.cpp
src/common/ircuser.cpp
src/common/ircuser.h
src/core/ircserverhandler.cpp
src/core/ircserverhandler.h
src/qtui/chatline-old.cpp
src/qtui/inputwidget.cpp
src/qtui/mainwin.cpp
src/qtui/settingspages/colorsettingspage.ui
version.inc