comparison libpurple/ft.c @ 18271:589c9ebf84db

merge of '683ac90580e5631dcc8b79c3caea1adc7b92ffec' and '947b20b6fc725a1f22dd7b7b23ebbaee89f0cfed'
author Nathan Walp <nwalp@pidgin.im>
date Sun, 24 Jun 2007 17:52:52 +0000
parents e62095e99db0
children 57d350900136 bb30030a22b6
comparison
equal deleted inserted replaced
18269:08ec2f08e38c 18271:589c9ebf84db