Mercurial > pidgin.yaz
diff pidgin/Makefile.am @ 26001:9115f71ad73a
Fixing busted merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | c0e3b62f8098 |
children | ff4212a5268f f5e613e05332 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | c0e3b62f8098 |
children | ff4212a5268f f5e613e05332 |