Merge branch 'dcc-whiteboard'
authorBernd Buschinski <b.buschinski@web.de>
Sat, 13 Feb 2010 21:41:58 +0000 (22:41 +0100)
committerBernd Buschinski <b.buschinski@web.de>
Sat, 13 Feb 2010 21:41:58 +0000 (22:41 +0100)
commitac90418b218334d9773b8ade2aca21fe0bf3e4f1
treebc8dcfb220afefdfe04d133c9c52940e79a2f68f
parent181b9182d233eff093183e47d0d72ec6f458bb68
parent7be0c6cf3eaf73e76fa4a391f810a17b3e02a74b
Merge branch 'dcc-whiteboard'

Conflicts:
src/dcc/chat.cpp
src/dcc/chatcontainer.cpp
src/dcc/chat.cpp
src/dcc/chatcontainer.cpp
src/irc/channel.cpp
src/irc/server.cpp
src/irc/server.h