Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/oscar.c @ 22031:9bfdf68d185c
merge of '5fc55e3a78ccb0a463df332592e62c5a371cd8b4'
and 'ca3452eca310a510c6932f9a618b79da824d796a'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 07 Jan 2008 16:28:25 +0000 |
parents | 31a631d08d46 |
children | f808629a0123 4426e530c156 |
comparison
equal
deleted
inserted
replaced
22030:21ed56853648 | 22031:9bfdf68d185c |
---|---|
5 * Some code copyright (C) 1999-2001, Eric Warmenhoven | 5 * Some code copyright (C) 1999-2001, Eric Warmenhoven |
6 * Some code copyright (C) 2001-2003, Sean Egan | 6 * Some code copyright (C) 2001-2003, Sean Egan |
7 * Some code copyright (C) 2001-2007, Mark Doliner <thekingant@users.sourceforge.net> | 7 * Some code copyright (C) 2001-2007, Mark Doliner <thekingant@users.sourceforge.net> |
8 * Some code copyright (C) 2005, Jonathan Clark <ardentlygnarly@users.sourceforge.net> | 8 * Some code copyright (C) 2005, Jonathan Clark <ardentlygnarly@users.sourceforge.net> |
9 * Some code copyright (C) 2007, ComBOTS Product GmbH (htfv) <foss@combots.com> | 9 * Some code copyright (C) 2007, ComBOTS Product GmbH (htfv) <foss@combots.com> |
10 * Some code copyright (C) 2008, Aman Gupta | |
10 * | 11 * |
11 * Most libfaim code copyright (C) 1998-2001 Adam Fritzler <afritz@auk.cx> | 12 * Most libfaim code copyright (C) 1998-2001 Adam Fritzler <afritz@auk.cx> |
12 * Some libfaim code copyright (C) 2001-2004 Mark Doliner <thekingant@users.sourceforge.net> | 13 * Some libfaim code copyright (C) 2001-2004 Mark Doliner <thekingant@users.sourceforge.net> |
13 * | 14 * |
14 * This program is free software; you can redistribute it and/or modify | 15 * This program is free software; you can redistribute it and/or modify |