Mercurial > pidgin
changeset 16549:e87a490968bb
merge of '8038098094432fe9f6d324d1e4aadb8ff1f9e44a'
and 'e752600f71cd86301f03b40c317898826c4ee34a'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 28 Apr 2007 00:39:37 +0000 |
| parents | ec8a3ca95a13 (diff) 0cd684e34403 (current diff) |
| children | b8ba44eafaae |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/request.h Sat Apr 28 00:36:53 2007 +0000 +++ b/libpurple/request.h Sat Apr 28 00:39:37 2007 +0000 @@ -1332,7 +1332,7 @@ * @param cancel_text The text for the @c Cancel button. * @param cancel_cb The callback for the @c Cancel button. * @param account The PurpleAccount associated with this request, or NULL if none is - * @param who The username of the buddy assocaited with this request, or NULL if none is + * @param who The username of the buddy associated with this request, or NULL if none is * @param conv The PurpleConversation associated with this request, or NULL if none is * @param user_data The data to pass to the callback. *