Mercurial > pidgin
diff libpurple/protocols/qq/qq.c @ 25890:43b721aa4b76
explicit merge of '32d4ce0b6cfc9ccb9a6e7ed661423b9260a0bead'
and '0bcc8cd8e68241cf9c13be5b28ced3a4a5d4e488'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 02 Jan 2009 22:28:34 +0000 |
| parents | 1260a3fb60f4 b74fa0d31c74 |
| children | 4b8c4870b13a |
line wrap: on
line diff
--- a/libpurple/protocols/qq/qq.c Fri Jan 02 22:23:58 2009 +0000 +++ b/libpurple/protocols/qq/qq.c Fri Jan 02 22:28:34 2009 +0000 @@ -627,7 +627,7 @@ g_string_append(info, "puzzlebird<br>\n"); g_string_append(info, "<br>\n"); g_string_append(info, _("<p><b>Code Contributors</b>:<br>\n")); - g_string_append(info, "gfhuang : patches for libpurple 2.0.0beta2, maintainer<br>\n"); + g_string_append(info, "gfhuang(poppyer) : patches for libpurple 2.0.0beta2, maintainer<br>\n"); g_string_append(info, "Yuan Qingyun : patches for libpurple 1.5.0, maintainer<br>\n"); g_string_append(info, "henryouly : file transfer, udp sock5 proxy and qq_show, maintainer<br>\n"); g_string_append(info, "hzhr : maintainer<br>\n");