# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1340737741 -3600
# Node ID 07660ac09a5f1888d33030812f7d733b7c1c9f83
# Parent  de0ed24eb9615e5460f2f2e85aa5931f04b00e6c# Parent  7ca4acc659bbdd2102114cfb51303c3ca3df4e90
Merge heads, but keep de0ed24eb961/IBBoard

diff -r de0ed24eb961 -r 07660ac09a5f IBBoard.csproj
diff -r de0ed24eb961 -r 07660ac09a5f Xml/XmlResourceResolver.cs
diff -r de0ed24eb961 -r 07660ac09a5f Xml/XmlTools.cs