merge of 'cec409be4a175b13f24c312aedb8ab104689cba0'

Fix #318 which asked for the buddynote plugins notes to be shown in the

We now depend on SILC Toolkit 1.1 for this copy of this prpl so we can

Kill a compile warning

Don't automatically add channels to the buddy list when you join them. I

Remove the following SILC account options, as suggested by Pekka Riikonen

Update POTFILES.in with the silc10 filenames

Patch from Pekka Riikonen to update the SILC protocol plugin to work with

Duplicate the current SILC prpl as silc10 for backwards compatibility with

Avoid including NSPR's private header pprio.h just for the prototype of

(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip

mercurial