diff libpurple/proxy.h @ 19952:ce7569c8aa0d

merge of '2e581033a2565fca7ce0dd0b8a5b84ecc919c830' and '56ff2dc43e1db5815085ae8d729ec119c0e908ff'
author Gabriel Schulhof <nix@go-nix.ca>
date Sat, 18 Aug 2007 00:00:13 +0000
parents 36b09c6f7957
children 44b4e8bd759b
line wrap: on
line diff