Mercurial > pidgin
diff libpurple/gconf/Makefile.am @ 25228:6fed1bb3b02e
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | 309c1478b457 |
children | f7d03842b9c9 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | 309c1478b457 |
children | f7d03842b9c9 |