Mercurial > pidgin.yaz
diff finch/gntroomlist.c @ 25802:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | ad357ca94de9 |
children | c1f954e51389 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | ad357ca94de9 |
children | c1f954e51389 |