changeset 1523:f73a4e8c7040

Merge from branch 3.0-integration
author Chris Cannam
date Tue, 10 Jan 2017 16:21:32 +0000
parents a0a37ed3c07a (diff) f016667b4adb (current diff)
children 0f42e0ec6f4c
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jan 10 16:04:03 2017 +0000
+++ b/.hgtags	Tue Jan 10 16:21:32 2017 +0000
@@ -50,3 +50,4 @@
 2868d5abf1a3baa37099c1b5d7e984bf8bb8177a sv_v2.4.1
 94253fa113183075c8400fa64d0ccb0e81682f90 sv_v2.5
 e206741df37ddfa3db28bfbbe4b79f2248b92695 sv_v2.5_osx_deploy
+e6c7585863feeba4d278c770314e3455e0020bdb last_v2.5_on_default_branch