Mercurial > pidgin.yaz

diff libpurple/marshallers.list @ 29712:d5fe33c3a765

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 42a8485e73af5f2091d307b51c09dded94eceb24) to branch 'im.pidgin.pidgin.next.minor' (head 4edcf8da14be654127117da5af0cbdd7a0616439)
author John Bailey <rekkanoryo@rekkanoryo.org>
date Tue, 17 Nov 2009 07:33:47 +0000
parents 0ae9306de1f6
children
line wrap: on
line diff
--- a/libpurple/marshallers.list	Tue Nov 17 07:33:34 2009 +0000
+++ b/libpurple/marshallers.list	Tue Nov 17 07:33:47 2009 +0000
@@ -4,3 +4,5 @@
 VOID:STRING,STRING,DOUBLE
 VOID:ENUM,STRING,STRING
 VOID:ENUM,STRING,STRING,BOOLEAN
+VOID:FLAGS,FLAGS
+VOID:STRING,STRING,OBJECT,OBJECT