Merge branch 'dcc-whiteboard' of gitorious.org:konversation/konversation into dcc...
authorBernd Buschinski <b.buschinski@web.de>
Tue, 19 Jan 2010 22:44:52 +0000 (23:44 +0100)
committerBernd Buschinski <b.buschinski@web.de>
Tue, 19 Jan 2010 22:44:52 +0000 (23:44 +0100)
commitfb23a360067109bc11b6321b1425ff78acb7fd30
tree5c140d470a115bfd2f8ed1417433bc40b33f5684
parent498adbc5137d23a60024b8306a1dc8d6e240e52a
parentd32094ab929564399328c432b68ccdf3b9e260b0
Merge branch 'dcc-whiteboard' of gitorious.org:konversation/konversation into dcc-whiteboard

Conflicts:
src/CMakeLists.txt
src/dcc/whiteboard.cpp
src/dcc/whiteboard.h
src/dcc/whiteboardpaintarea.cpp
src/dcc/whiteboardpaintarea.h
src/dcc/whiteboardtoolbar.cpp
src/dcc/whiteboardtoolbar.h
src/dcc/whiteboardpaintarea.cpp