Mercurial > pidgin
diff libpurple/value.h @ 29267:58e1e1463b6e
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 6bf32c9e15a7 |
children | 5ffd5582f5fe |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 6bf32c9e15a7 |
children | 5ffd5582f5fe |