prawnsalad/KiwiIRC — pull request #388 by andrewcolden (2013-09-10 18:28:23+00:00)
Title: notifications merge into development take 2 (for real this time)

Attempt #2 to make this merge work for development branch. The code that used to be in panel.js now needs to be inserted into channel.js (just one line):

_kiwi.app.view.showNotification(msg.nick, msg.msg);

I inserted this line and did not change panel.js at all from the development branch, resolving that merge conflict.

Hopefully this won't require a third time...