Merge
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 30 Jan 2019 21:35:18 +0000
changeset 1126 aaa6de86dea9
parent 1125 34a31c1b6f85 (current diff)
parent 1080 0834ac12e4a8 (diff)
child 1127 4dd9c37c427b
Merge
.hgtags
--- a/.hgtags	Wed Jan 30 21:35:08 2019 +0000
+++ b/.hgtags	Wed Jan 30 21:35:18 2019 +0000
@@ -10,6 +10,8 @@
 3db3e2fa66b5ea07978d8401f046d9b369d92909 expecco_2_9_0
 3db3e2fa66b5ea07978d8401f046d9b369d92909 expecco_2_9_0_win75_lx36
 3db3e2fa66b5ea07978d8401f046d9b369d92909 expecco_2_9_1
+5e30a2e57cbc2d2597034d4fccc29432199e406c expeccoALM_1_13
+5e30a2e57cbc2d2597034d4fccc29432199e406c expecco_18_2_0
 644a3072be96cecb202e66323f8fe09c2267b243 expecco_ALM_1_9_7
 d0117a7b0c442ade4d46a1ebce27c73531c7b9d5 expecco_2_7_0
 d0117a7b0c442ade4d46a1ebce27c73531c7b9d5 expecco_2_7_0_49