Merged f92210d4585b and 9018fb0f1944
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 15 Jan 2015 11:53:40 +0000
changeset 510 e2c58b9a066b
parent 509 f92210d4585b (current diff)
parent 507 9018fb0f1944 (diff)
child 511 ad2f56473052
Merged f92210d4585b and 9018fb0f1944
--- a/.hgtags	Thu Jan 15 10:06:16 2015 +0000
+++ b/.hgtags	Thu Jan 15 11:53:40 2015 +0000
@@ -1,2 +1,2 @@
-93b086927aea44a588bf81558912f94e49838f1e 1.0
-93b086927aea44a588bf81558912f94e49838f1e r1.0
+395a5253c3d4ec8b794185ebcab2cf5d88d897c1 expecco_2_7_0
+395a5253c3d4ec8b794185ebcab2cf5d88d897c1 expecco_2_7_0_49