Mercurial > pidgin
diff libpurple/roomlist.h @ 25228:6fed1bb3b02e
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | 0efa36fe7d7c |
children | bf088afdc813 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | 0efa36fe7d7c |
children | bf088afdc813 |