Mercurial > pidgin.yaz
diff pidgin/Makefile.am @ 25802:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | e24f5640fa54 |
children | 9bdd3ab8087f 25e2ab1fff1d |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | e24f5640fa54 |
children | 9bdd3ab8087f 25e2ab1fff1d |