Mercurial > pidgin
diff finch/gntconn.h @ 29275:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 6bf32c9e15a7 |
children |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 6bf32c9e15a7 |
children |