Mercurial > pidgin.yaz
diff Makefile.am @ 25984:d24b476cc60f
Fix merge (i.e. reapply my changes here).
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 02:19:57 +0000 |
parents | 4b8c4870b13a |
children | cc8f641d2fde |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 02:19:57 +0000 |
parents | 4b8c4870b13a |
children | cc8f641d2fde |