comparison PLUGIN_HOWTO @ 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 83ec0b408926
children db5a58aabe38
comparison
equal deleted inserted replaced
20379:66c76cdf4c40 20694:d35d761ded1a