Mercurial > pidgin.yaz
diff libpurple/prpl.c @ 32176:f2a3c59fc4a6
Fix up merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 25 Jun 2011 19:56:59 +0000 |
parents | a8cc50c2279f |
children | 2c58de59bd57 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 25 Jun 2011 19:56:59 +0000 |
parents | a8cc50c2279f |
children | 2c58de59bd57 |