# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1524730169 -3600
# Node ID 28dce4eba04b30dd59c0f0ad244a5eca64f5369e
# Parent  26226d7c5f439a5069a9977cf0236f3cb614c03d# Parent  be3756d9dd20298e6ac428244bbd837a076454a5
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r be3756d9dd20 -r 28dce4eba04b .hgtags
--- a/.hgtags	Thu Apr 26 09:09:24 2018 +0100
+++ b/.hgtags	Thu Apr 26 09:09:29 2018 +0100
@@ -127,3 +127,4 @@
 01e938b89e7c693c1f4d03f0622b73fa8da4f5d4 build-default-293
 43b1c2c8dbdbaadfada80df9fde028765d170040 build-default-294
 e5e64dc86731d55ececf29a9d0707109cbee6f06 build-default-295
+6a851e9965ce67bdb1d6fff9d082abbfe71bc418 build-default-296