Mercurial > pidgin
comparison finch/gntconn.c @ 26132:edd2cebdead8
Manual merging...
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 02 Mar 2009 19:47:17 +0000 |
| parents | 07c2b8fa7bb4 |
| children | f7c5bb2f6623 |
comparison
equal
deleted
inserted
replaced
| 26131:ff4212a5268f | 26132:edd2cebdead8 |
|---|