Mercurial > pidgin
diff libpurple/proxy.h @ 31782:727edf2625f5
Patch up merge
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Thu, 11 Aug 2011 14:45:26 +0000 |
parents | 3e11fa72c5d8 |
children | ba74745ff179 3828a61c44da |
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Thu, 11 Aug 2011 14:45:26 +0000 |
parents | 3e11fa72c5d8 |
children | ba74745ff179 3828a61c44da |