Mercurial > pidgin
diff libpurple/smiley.c @ 29275:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | d8452c0bec7b |
children | 584063555949 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | d8452c0bec7b |
children | 584063555949 |