Mercurial > pidgin
diff finch/gntblist.h @ 30518:090e141a5214
Some merge-resolving...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | f1441c4e4d2f |
children | 02a2e8183b1d |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | f1441c4e4d2f |
children | 02a2e8183b1d |