projects / quassel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b5ecd2 310dc3a)
Merge pull request #96 from TheOneRing/qca_qt5
authorManuel Nickschas <sputnick@quassel-irc.org>
Thu, 23 Oct 2014 21:48:57 +0000 (23:48 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Thu, 23 Oct 2014 21:48:57 +0000 (23:48 +0200)
make quassel compile with qca enabled on qt5

1  2 
src/core/cipher.cpp patch | diff1 | diff2 | blob | history

diff --cc src/core/cipher.cpp
Simple merge
Quassel IRC