Mercurial > pidgin
diff ChangeLog.win32 @ 30518:090e141a5214
Some merge-resolving...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | 592d382e1bf4 |
children | 3a43e48c870e c38f6e6bf4ce |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | 592d382e1bf4 |
children | 3a43e48c870e c38f6e6bf4ce |