fixing pull / rebase aftermath
authorMarcus Eggenberger <egs@quassel-irc.org>
Sat, 16 Aug 2008 18:40:21 +0000 (20:40 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Sat, 16 Aug 2008 18:40:21 +0000 (20:40 +0200)
commitbf7d701df387cbd54d14860bdaa9d6c515211197
treeca62c5c22c8e00e2b3a3122609ceda578444394e
parenta117d3bd1592bae3b14630c953790a005b3c3a3d
fixing pull / rebase aftermath
src/qtui/chatitem.cpp
src/qtui/chatitem.h