diff .hgtags @ 1150:5e6e1e074080 3.0-plus-imaf

Merge branches 3.0-integration and imaf_enc to 3.0-plus-imaf
author Chris Cannam
date Wed, 20 Apr 2016 12:06:28 +0100
parents 7e1dbbff314f b39fc82c5595
children
line wrap: on
line diff
--- a/.hgtags	Fri Apr 15 16:26:15 2016 +0100
+++ b/.hgtags	Wed Apr 20 12:06:28 2016 +0100
@@ -41,8 +41,6 @@
 242ebf1db0f16582b883d65ae80df99c613b99a7 sv_v2.3
 7f7fba33b7de2890ca96dbd15969219bb9fe04b9 sv_v2.3
 59c68b5ae5be5997719ff959d40fe9ad36ab86ab sv_v2.3-f
-59c68b5ae5be5997719ff959d40fe9ad36ab86ab sv_v2.3-f
-0000000000000000000000000000000000000000 sv_v2.3-f
 7f7fba33b7de2890ca96dbd15969219bb9fe04b9 sv_v2.3
 bf06f4311ec0af43f93a15489a757955e07597cd sv_v2.3
 cfbea29fae640aed5c8b7265d6806df823f34fef sv_v2.4
@@ -50,3 +48,4 @@
 2868d5abf1a3baa37099c1b5d7e984bf8bb8177a sv_v2.4.1
 94253fa113183075c8400fa64d0ccb0e81682f90 sv_v2.5
 e206741df37ddfa3db28bfbbe4b79f2248b92695 sv_v2.5_osx_deploy
+60d3575f8016db7080154978c6457d37ca43dbbb sv-v2.3-imaf