changeset
merge of 'ea4997d38b748d60927fced4a358361596b9ab0e'
Mon, 07 Jan 2008 16:28:25 +0000
- author
- Mark Doliner <markdoliner@pidgin.im>
- date
- Mon, 07 Jan 2008 16:28:25 +0000
- changeset 22152
- 296c8ecd34c9
- parent 22151
- ea4997d38b74 (current diff)
- parent 22130
- f1396263a052 (diff)
- child 22153
- d06709ab25a3
merge of 'ea4997d38b748d60927fced4a358361596b9ab0e'
and 'f1396263a05272e11372fabb495897576280e022'
--- 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>
