Mercurial > pidgin

diff libpurple/proxy.h @ 32696:763d65f3f758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
explicit merge of '6ab9f5ff810acde3c06a2add7b8df2bd75cce6e3' and '7a0bb807afc9c1c3f2aaa7143fc5d1e3dc7c6ee8' to branch 'im.pidgin.cpw.qulogic.gtk3'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 23 Dec 2011 06:58:52 +0000
parents 02a2e8183b1d
children 98520ee78f12
line wrap: on
line diff