Mercurial > pidgin
diff PLUGIN_HOWTO @ 26132:edd2cebdead8
Manual merging...
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 02 Mar 2009 19:47:17 +0000 |
| parents | 83ec0b408926 |
| children | db5a58aabe38 |
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 02 Mar 2009 19:47:17 +0000 |
| parents | 83ec0b408926 |
| children | db5a58aabe38 |