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)
commit90803b4288736e6c53d50eeb4fbbe2525be968c3
treedcd418541b28c5fba3fce1533cc5f3d0ea3d21c6
parent8b5ecd226f9208af3074b33d3b7cf5e14f55b138
parent310dc3ae20541ec5364a9e70a17f3322adb5723f
Merge pull request #96 from TheOneRing/qca_qt5

make quassel compile with qca enabled on qt5
src/core/cipher.cpp