Mercurial > pidgin.yaz
diff ChangeLog.win32 @ 25984:d24b476cc60f
Fix merge (i.e. reapply my changes here).
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 02:19:57 +0000 |
parents | 52fbda23e398 |
children | 01f1929d0936 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 02:19:57 +0000 |
parents | 52fbda23e398 |
children | 01f1929d0936 |