# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1229456163 0
# Node ID b9e1e062007e0b89f007896cd50d690c60810a36
# Parent  476466aca5e0c0168fb3ea48f83da6cc5e8a77f2# Parent  9f6ae339e8493c42c3f5fc6a2aff7ee7095ef4f3
merge of '6b951d62be418d5bfc437a1ab747c6ba900d7979'
     and 'd9facf0b24577675796e6ff34f126f1eb0699e27'

diff -r 476466aca5e0 -r b9e1e062007e libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Tue Dec 16 18:32:25 2008 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Tue Dec 16 19:36:03 2008 +0000
@@ -1133,6 +1133,8 @@
 /**
  * Get contact list, calling msim_got_contact_list() with
  * what_to_do_after as user_data gpointer.
+ *
+ * @param what_to_do_after should be one of the MSIM_CONTACT_LIST_* #defines.
  */
 static gboolean
 msim_get_contact_list(MsimSession *session, int what_to_do_after)