Mercurial > pidgin
diff libpurple/roomlist.c @ 29276:a0668fbf2483
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:53:53 +0000 |
parents | c1f954e51389 |
children | f1437342cc0e |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:53:53 +0000 |
parents | c1f954e51389 |
children | f1437342cc0e |