Mercurial > pidgin
diff ChangeLog.win32 @ 30520:025fe823a921
Fix merge and a compilation error
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 14 Feb 2010 22:42:11 +0000 |
parents | 3a43e48c870e |
children | 1eeeb20f0b9f dcd52d2b1b97 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 14 Feb 2010 22:42:11 +0000 |
parents | 3a43e48c870e |
children | 1eeeb20f0b9f dcd52d2b1b97 |