comparison libpurple/proxy.h @ 15845:13fb0ad0e285

merge of '0a663b4559fccaac525563fa419332507e4a0475' and '2a271b0a4c27ed8273e153322907ede77bc65587'
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 19 Mar 2007 18:44:36 +0000
parents 32c366eeeb99
children 36b09c6f7957
comparison
equal deleted inserted replaced
15840:c4f348500fa7 15845:13fb0ad0e285