Mercurial > pidgin
diff libpurple/ft.h @ 29267:58e1e1463b6e
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | b99d6d21cd79 |
children | 4a4e9d309fc0 3882d419e628 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | b99d6d21cd79 |
children | 4a4e9d309fc0 3882d419e628 |