Mercurial > pidgin
diff libpurple/buddyicon.c @ 29267:58e1e1463b6e
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 8282911d5e17 |
children | 9c0337d4b878 5ebfa814b9e8 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 8282911d5e17 |
children | 9c0337d4b878 5ebfa814b9e8 |