Mercurial > pidgin.yaz
diff libpurple/ft.c @ 29670:a0668fbf2483
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:53:53 +0000 |
parents | 568b786c36f9 |
children | 4cbe258db067 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:53:53 +0000 |
parents | 568b786c36f9 |
children | 4cbe258db067 |