Mercurial > pidgin
changeset 15703:6fb980722258
merge of '0f78eae62180df08349a7bebac400b35c8af75b8'
and 'aafde1f10d73a64e2613f10b1d18b92cd62e8ac2'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sun, 25 Feb 2007 19:12:01 +0000 |
| parents | 87e807f25b3c (current diff) 400252586119 (diff) |
| children | fe5398f498ee |
| files | pidgin/pixmaps/gaim_16.ico pidgin/pixmaps/gaim_4bit_16.ico pidgin/pixmaps/gaim_away.ico pidgin/pixmaps/gaim_away_16.ico pidgin/pixmaps/gaim_away_4bit_16.ico pidgin/pixmaps/gaim_blank_4bit_16.ico pidgin/pixmaps/gaim_msgpend_16.ico pidgin/pixmaps/gaim_msgpend_4bit_16.ico pidgin/pixmaps/gaim_msgunread_16.ico pidgin/pixmaps/gaim_msgunread_4bit_16.ico pidgin/pixmaps/gaim_offline.ico pidgin/pixmaps/gaim_offline_16.ico pidgin/pixmaps/gaim_offline_4bit_16.ico |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Feb 25 19:11:00 2007 +0000 +++ b/ChangeLog Sun Feb 25 19:12:01 2007 +0000 @@ -192,7 +192,8 @@ * SIP/SIMPLE support (Thomas Butter, Google Summer of Code) * Sametime protocol support Requires the meanwhile library: http://meanwhile.sourceforge.net - * QQ protocol support (Mark Huetsch, Google Summer of Code) + * QQ protocol support (Mark Huetsch, Google Summer of Code, and the + developers of the OpenQ project) * Removed the Napster and TOC protocols plugins Other Noteworthy Changes: