Mercurial > pidgin.yaz
diff libpurple/proxy.h @ 26939:657d42e865dd
merge of 'f9080d0b3274907da710c3d4d85669464e418ba4'
and 'f9a68099082693adb096e95d47ed2e07d624f526'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 10 May 2009 22:07:22 +0000 |
parents | d25cbbea7fe5 |
children | 4c3b1bb3ba91 |