Mercurial > pidgin
comparison libpurple/protocols/Makefile.am @ 21042:b3ae0eb23df3
merge of '022ff8d97a85c1c5ea7b66f7d6ce6c607fd12a32'
and '7f71f284598d962a9074116360bce09e65458488'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sun, 28 Oct 2007 17:27:07 +0000 |
parents | 90a41215bcb1 |
children | 8ae3eef4a27d |
comparison
equal
deleted
inserted
replaced
21039:5af17c5a4a12 | 21042:b3ae0eb23df3 |
---|