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