Mercurial > pidgin
diff finch/gntdebug.c @ 30518:090e141a5214
Some merge-resolving...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | 259bbfb423d4 |
children | 6a3aaa4e5e56 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | 259bbfb423d4 |
children | 6a3aaa4e5e56 |