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, 7 Sep 2016 19:58:12 +0000 (21:58 +0200)
commit809f86daa290cf67f9b30445b26378fff0030672
tree2531110ab65d7033eb244c754852386b774d6dce
parent3be4dcd0386965097be6a29fa30d4541118aa654
Allow core-side channel buffer merges

Also fix a typo in the warning for a merge that fails the tests.
src/core/corebuffersyncer.cpp