Mercurial > pidgin
diff libpurple/blist.h @ 29267:58e1e1463b6e
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 8282911d5e17 |
children | d8452c0bec7b da46097b4722 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 8282911d5e17 |
children | d8452c0bec7b da46097b4722 |