Mercurial > pidgin
diff libpurple/ft.h @ 29275:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | b99d6d21cd79 |
children | 4a4e9d309fc0 3882d419e628 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | b99d6d21cd79 |
children | 4a4e9d309fc0 3882d419e628 |