Mercurial > pidgin
view libpurple/marshallers.list @ 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 | c8ff0a9cf8cc |
children | e144a461cf3c |
line wrap: on
line source
VOID:POINTER,POINTER,OBJECT BOOLEAN:OBJECT,POINTER,STRING VOID:STRING,STRING VOID:STRING,STRING,DOUBLE VOID:ENUM,STRING,STRING VOID:ENUM,STRING,STRING,BOOLEAN