Mercurial > pidgin
comparison libpurple/marshallers.list @ 29555:8afc47597413
merge of 'd2f2c48292c37816f81123f7d805891c57238119'
and 'd39086ef4ef94396c2b7fd5699fc3bfd04dc885d'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 08 Mar 2010 22:53:02 +0000 |
| parents | 0ae9306de1f6 |
| children |
comparison
equal
deleted
inserted
replaced
| 29554:41e557b8d38c | 29555:8afc47597413 |
|---|---|
| 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 |