projects / quassel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8bf4155) | patch
Allow core-side channel buffer merges
authorselabnayr <ryanb@stmproducts.com>
Fri, 24 Jun 2016 21:20:50 +0000 (14:20 -0700)
committerManuel Nickschas <sputnick@quassel-irc.org>
Wed, 28 Feb 2018 22:22:32 +0000 (23:22 +0100)
commit481f91bd25286721a4f6572c6e71e45e3c0f9c1a
tree32a516e642933015c6f6f17da7bb91501749ca1btree | snapshot
parent8bf4155c52557a43571b5d82dcd710e63165fb04commit | diff
Allow core-side channel buffer merges

Also fix a typo in the warning for a merge that fails the tests.

(cherry picked from commit 809f86daa290cf67f9b30445b26378fff0030672)
src/core/corebuffersyncer.cpp diff | blob | history
Quassel IRC