# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1250993481 0
# Node ID 208f4d20ac5d3c6c092ed6a43cb9dec37e1f8d89
# Parent  74ce58c7bc309bfbec27b3d33defd076d92c34b1# Parent  af9b9196d68d836e04dfbbfa3874dcff6b07da03
merge of '34ceac72c21973ff539a829c2f570c0670c18ec4'
     and '356e48ac981726c10517f85059ac9f29e3e1bea4'

diff -r 74ce58c7bc30 -r 208f4d20ac5d PLUGIN_HOWTO
--- a/PLUGIN_HOWTO	Sun Aug 23 02:10:43 2009 +0000
+++ b/PLUGIN_HOWTO	Sun Aug 23 02:11:21 2009 +0000
@@ -1,6 +1,6 @@
 For information on writing a plugin for Purple, Pidgin or Finch, go
-http://developer.pidgin.im and click on API.  From there, see the HOWTOs in the
-"Related Pages" section.
+http://developer.pidgin.im and click on API.  From there, see the
+HOWTOs in the "Related Pages" section.
 
 You can also generate this documentation locally by installing
 doxygen and graphviz dot, then running "make docs" in the
diff -r 74ce58c7bc30 -r 208f4d20ac5d libpurple/protocols/msn/cmdproc.h
--- a/libpurple/protocols/msn/cmdproc.h	Sun Aug 23 02:10:43 2009 +0000
+++ b/libpurple/protocols/msn/cmdproc.h	Sun Aug 23 02:11:21 2009 +0000
@@ -71,6 +71,4 @@
 void msn_cmdproc_process_payload(MsnCmdProc *cmdproc,
 								 char *payload, int payload_len);
 
-void msn_cmdproc_disconnect(MsnCmdProc *cmdproc);
-
 #endif /* _MSN_CMDPROC_H_ */