changeset 276:cacf3fdf8208

Merge
author Chris Cannam
date Wed, 14 May 2014 09:51:44 +0100
parents 1e07d22fb28c (diff) a7f6e3f5ffbb (current diff)
children 2c19b0537bd2
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Apr 26 22:22:19 2014 +0100
+++ b/.hgtags	Wed May 14 09:51:44 2014 +0100
@@ -8,3 +8,5 @@
 fc04fd860d7fceaee2c3fe1bfbd1d2b63a44c12b v0.4
 e0337a99285d0efe486025184bd1a3f0752dc1dd v0.4_win32_build
 29455a21880ef7e60ac0b23beee34262e92a0284 v0.5
+29455a21880ef7e60ac0b23beee34262e92a0284 v0.5
+846df0ea9c82206ed9185536d7d3eab35eb68b07 v0.5