comparison libpurple/proxy.h @ 31252:ae838d29c897

merge of '3031bead50a8d359f718d5d9accd75d5e79fac7d' and '82147786072b59a286d5a14abfcf7ff7c56fbb35'
author Evan Schoenberg <evan.s@dreskin.net>
date Mon, 21 Feb 2011 22:57:05 +0000
parents 4c3b1bb3ba91
children 9a7c5d242521
comparison
equal deleted inserted replaced
31250:a3bfd9439d37 31252:ae838d29c897