Mercurial > pidgin

comparison libpurple/prpl.c @ 31719:e0856c50cdd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the merge some more I don't know whether this was me, kdiff3, or monotone on something.
author Paul Aurich <paul@darkrain42.org>
date Sun, 26 Jun 2011 20:37:03 +0000
parents a8cc50c2279f
children 2c58de59bd57 3828a61c44da
comparison
equal deleted inserted replaced
31718:f2a3c59fc4a6 31719:e0856c50cdd8