Mercurial > pidgin
comparison Makefile.am @ 31719:e0856c50cdd8
Fix the merge some more
I don't know whether this was me, kdiff3, or monotone on something.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 26 Jun 2011 20:37:03 +0000 |
| parents | a7cf3dbaba02 |
| children | 6f3df8fc3037 3e4b6ffbb551 |
comparison
equal
deleted
inserted
replaced
| 31718:f2a3c59fc4a6 | 31719:e0856c50cdd8 |
|---|