Mercurial > pidgin
diff ChangeLog.API @ 20694:d35d761ded1a
propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head e76d28a0d9305478af3a13c36b2feaa466fc27ec)
to branch 'im.pidgin.pidgin' (head fe204b08484653e89ab7ac68a4f50421599e078c)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 20:29:06 +0000 |
| parents | 51aff4db29da |
| children | f33ed41b6dee 34fc2a999977 4511d15a8f80 5cd2fe9a6629 |
