Mercurial > pidgin

comparison COPYRIGHT @ 29032:4e93d6d57067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 bafc2a8bb747
children 185677f47825
comparison
equal deleted inserted replaced
29031:f9b7a0033939 29032:4e93d6d57067