Merged changes from branch "sput" r56:61 back into trunk.
authorManuel Nickschas <sputnick@quassel-irc.org>
Fri, 4 May 2007 15:08:18 +0000 (15:08 +0000)
committerManuel Nickschas <sputnick@quassel-irc.org>
Fri, 4 May 2007 15:08:18 +0000 (15:08 +0000)
commit2a068c11e76c7b34afb64d443dbb1afd2e208aaa
tree6c0fcef3d61a6fd7c81b5844fff672ff343e7797
parent12369966345e76e3bba92f64c84c940ef4d8d916
Merged changes from branch "sput" r56:61 back into trunk.

This contains a lot of new stuff in all parts of quassel. It also contains a serious
bug, which for some reason causes quassel to crash every few starts. Merging this only
because of public request.

So don't complain - I've warned you!
45 files changed:
CMakeLists.txt
Doxyfile
core/core.cpp
core/core.h
core/coreproxy.h
core/server.cpp
core/server.h
gui/CMakeLists.txt
gui/buffer.cpp
gui/buffer.h
gui/bufferwidget.cpp [new file with mode: 0644]
gui/bufferwidget.h [new file with mode: 0644]
gui/channelwidgetinput.cpp
gui/chatwidget.cpp
gui/chatwidget.h
gui/guiproxy.cpp
gui/guiproxy.h
gui/mainwin.cpp
gui/mainwin.h
gui/networkview.cpp
gui/networkview.h
gui/serverlist.cpp
gui/settingsdlg.cpp [new file with mode: 0644]
gui/settingsdlg.h [moved from gui/settings.h with 89% similarity]
gui/settingspages.cpp [moved from gui/settings.cpp with 74% similarity]
gui/settingspages.h [new file with mode: 0644]
gui/style.cpp
gui/style.h
gui/ui/aboutdlg.ui [new file with mode: 0644]
gui/ui/buffermgmntsettingspage.ui [new file with mode: 0644]
gui/ui/bufferwidget.ui
gui/ui/connectionsettingspage.ui [new file with mode: 0644]
gui/ui/coresettingspage.ui [new file with mode: 0644]
gui/ui/mainwin.ui
gui/ui/networkview.ui
gui/ui/settingsdlg.ui
main/CMakeLists.txt
main/main_gui.cpp
main/main_mono.cpp
main/message.cpp
main/message.h
main/proxy_common.h
main/settings.cpp [new file with mode: 0644]
main/settings.h [new file with mode: 0644]
plugins/plugin.h