comparison libpurple/marshallers.list @ 29712:d5fe33c3a765

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
comparison
equal deleted inserted replaced
28963:546e870dc506 29712:d5fe33c3a765
2 BOOLEAN:OBJECT,POINTER,STRING 2 BOOLEAN:OBJECT,POINTER,STRING
3 VOID:STRING,STRING 3 VOID:STRING,STRING
4 VOID:STRING,STRING,DOUBLE 4 VOID:STRING,STRING,DOUBLE
5 VOID:ENUM,STRING,STRING 5 VOID:ENUM,STRING,STRING
6 VOID:ENUM,STRING,STRING,BOOLEAN 6 VOID:ENUM,STRING,STRING,BOOLEAN
7 VOID:FLAGS,FLAGS
8 VOID:STRING,STRING,OBJECT,OBJECT