Mercurial > pidgin
diff finch/Makefile.am @ 25209:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 88796aff14d6 |
children | f5bcb58bdf56 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 88796aff14d6 |
children | f5bcb58bdf56 |