Mercurial > pidgin
changeset 22031:9bfdf68d185c
merge of '5fc55e3a78ccb0a463df332592e62c5a371cd8b4'
and 'ca3452eca310a510c6932f9a618b79da824d796a'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 07 Jan 2008 16:28:25 +0000 |
| parents | 21ed56853648 (current diff) 31a631d08d46 (diff) |
| children | 64d6bcc9d619 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Mon Jan 07 15:52:50 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Jan 07 16:28:25 2008 +0000 @@ -7,6 +7,7 @@ * Some code copyright (C) 2001-2007, Mark Doliner <thekingant@users.sourceforge.net> * Some code copyright (C) 2005, Jonathan Clark <ardentlygnarly@users.sourceforge.net> * Some code copyright (C) 2007, ComBOTS Product GmbH (htfv) <foss@combots.com> + * Some code copyright (C) 2008, Aman Gupta * * Most libfaim code copyright (C) 1998-2001 Adam Fritzler <afritz@auk.cx> * Some libfaim code copyright (C) 2001-2004 Mark Doliner <thekingant@users.sourceforge.net>