Mercurial > pidgin
diff libpurple/buddyicon.c @ 29275:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 8282911d5e17 |
children | 9c0337d4b878 5ebfa814b9e8 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 8282911d5e17 |
children | 9c0337d4b878 5ebfa814b9e8 |