comparison doc/pidgin.1.in @ 23465:1d97298ccff5

Fix up some merge errors in MSN's notification.c. Darn meld...
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 07 Jun 2008 03:56:23 +0000
parents 40d3767fb1b9
children 62a22a224f27
comparison
equal deleted inserted replaced
23464:1ac5faa72c8d 23465:1d97298ccff5