Mercurial > pidgin
diff libpurple/pounce.c @ 29032:4e93d6d57067
merge of '85129843be7a2667238f42c3652ffe0fd3fa37cb'
and '98b5bca32c1d0f95ef48796a9c257bfc7d886869'
Merge german translations. I arbitrarily picked a translation for the conflicting addition.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Thu, 11 Feb 2010 20:14:36 +0000 |
parents | 32a707746454 |
children | 4076f53cdd84 73b005a20d06 |