comparison libpurple/proxy.h @ 28969:757a386a5c93

merge of '7f93eb293109127d6a055f9a6aaa8baaa85207d1' and '9028ac0daaa1f7e565726fa39aca22ce7d3ecc49'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Thu, 04 Feb 2010 05:46:37 +0000
parents 4c3b1bb3ba91
children 9a7c5d242521
comparison
equal deleted inserted replaced
28968:5f6571bb128d 28969:757a386a5c93