Mercurial > pidgin
view finch/libgnt/genmarshal @ 31719:e0856c50cdd8
Fix the merge some more
I don't know whether this was me, kdiff3, or monotone on something.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 26 Jun 2011 20:37:03 +0000 |
parents | 1983ecd15174 |
children |
line wrap: on
line source
BOOLEAN:VOID BOOLEAN:STRING VOID:INT,INT,INT,INT VOID:INT,INT VOID:POINTER,POINTER BOOLEAN:INT,INT BOOLEAN:INT,INT,INT BOOLEAN:POINTER,POINTER,POINTER BOOLEAN:INT,INT,INT,POINTER VOID:STRING,STRING VOID:POINTER,BOOLEAN