view po/POTFILES.skip @ 19137:51772173a916

Fixed a few merge errors
author Eric Polino <aluink@pidgin.im>
date Fri, 06 Jul 2007 01:08:22 +0000
parents c6233773ce1d
children
line wrap: on
line source

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