Merge
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 13 Apr 2016 23:01:30 +0100
changeset 3569 df131677f93e
parent 3568 e5c03e98b8c1 (current diff)
parent 3560 e0d22fa8905b (diff)
child 3570 fd7d377f6eb2
Merge
--- a/.hgtags	Thu Apr 07 18:47:45 2016 +0100
+++ b/.hgtags	Wed Apr 13 23:01:30 2016 +0100
@@ -49,12 +49,12 @@
 8a855ca6cd04e3c61287f2a34298ee42d8d72c29 expecco_2_1_0
 a38974a257e5ad75ffb2ecd1f15dc296c52fae18 expecco_1_3_4
 a38974a257e5ad75ffb2ecd1f15dc296c52fae18 expecco_1_5_0
-a90f04241c8a5d8fdd80b597bbc01fda5ab81669 expecco_ALM_1_9_5
 b3671565853da39ef6851b193c3fbf1829e97324 rel5_2_1
 b3671565853da39ef6851b193c3fbf1829e97324 rel5_2_2
 b3671565853da39ef6851b193c3fbf1829e97324 stable_expecco_sel
 bb380fa2d40f34ff73514b5db92cac98da2147cc expecco_2_8_0
 bb380fa2d40f34ff73514b5db92cac98da2147cc expecco_2_8_0a
+bb380fa2d40f34ff73514b5db92cac98da2147cc expecco_2_8_0b
 bb380fa2d40f34ff73514b5db92cac98da2147cc expecco_ALM_1_9_5
 bb380fa2d40f34ff73514b5db92cac98da2147cc expecco_ALM_1_9_6
 bb380fa2d40f34ff73514b5db92cac98da2147cc expecco_ALM_1_9_7