Mercurial > pidgin.yaz
comparison finch/Makefile.am @ 18685:c03e3fe11ea9
Fixed errors created by merge conflict resolve mistakes.
author | Andreas Monitzer <pidgin@monitzer.com> |
---|---|
date | Wed, 11 Jul 2007 23:27:12 +0000 |
parents | 5b2b0fbace45 |
children | 38ff7582c569 68a3b83795c6 |
comparison
equal
deleted
inserted
replaced
18684:5c1ed6296b56 | 18685:c03e3fe11ea9 |
---|