comparison libpurple/proxy.h @ 28269:df920ad8cf4f

merge of '21745356545795bcec9c44cff0e779429c5092c6' and '39fc4acd81cf1796220d3ed4fff0b17bc5acf6de'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 16 Aug 2009 03:27:56 +0000
parents 4c3b1bb3ba91
children 9a7c5d242521
comparison
equal deleted inserted replaced
28268:3b6f50b68f5d 28269:df920ad8cf4f