Mercurial > pidgin
diff Makefile.am @ 16449:74339f1f6975
fix botched merge
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Thu, 26 Apr 2007 19:54:19 +0000 |
parents | 83ec0b408926 |
children | 8748c83af14f |
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Thu, 26 Apr 2007 19:54:19 +0000 |
parents | 83ec0b408926 |
children | 8748c83af14f |