view po/POTFILES.skip @ 26154:618d122af044

resolving conflict - merging im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author Sulabh Mahajan <sulabh@soc.pidgin.im>
date Wed, 12 Nov 2008 10:17:38 +0000
parents c6233773ce1d
children
line wrap: on
line source

libpurple/protocols/null/nullprpl.c
pidgin/plugins/crazychat/cc_pidgin_plugin.c