diff ChangeLog.win32 @ 22164:d1fe81e3a850

merge of '131ee6ac42d38162c4fce7a7200a0afa01aed6ce' and '7180f1790b23a722d6c377359e36bcc7cc7cca05'
author Will Thompson <will.thompson@collabora.co.uk>
date Sun, 20 Jan 2008 13:54:26 +0000
parents b693b6cbeae4
children e2961252eb62
line wrap: on
line diff