comparison libpurple/proxy.c @ 16939:37c57a0a9686

merge of 'a3abeebd737a4da72703350943b5296ff974d14e' and 'a59988435c229bc56fef2f26e826f5cc15978599'
author Casey Harkins <charkins@pidgin.im>
date Tue, 08 May 2007 02:49:42 +0000
parents 4999bbc52881
children f1547260a11e
comparison
equal deleted inserted replaced
16938:06f6768b6e29 16939:37c57a0a9686