Mercurial > pidgin
diff libpurple/account.h @ 26132:edd2cebdead8
Manual merging...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 19:47:17 +0000 |
parents | 4b8c4870b13a |
children | 413b445a6018 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 19:47:17 +0000 |
parents | 4b8c4870b13a |
children | 413b445a6018 |