From bbe7df469c40beb309542c01f25c262340978629 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 15 Sep 2016 08:04:34 +0000
Subject: [PATCH] Merge branch 'pegs'

---
 src/tsmeasure.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/tsmeasure.c b/src/tsmeasure.c
index 6bd5f5c..4ed39eb 100644
--- a/src/tsmeasure.c
+++ b/src/tsmeasure.c
@@ -78,9 +78,8 @@
                     ts_fprintf(stdout,"timestep: %u filename: %s\n",atoi(number),ent->d_name);
 			printf("%u ",atoi(number));
 			vesicle=restoreVesicle(ent->d_name);
-//			vesicle_calculate_ulm2(vesicle);
+			vesicle_calculate_ulm2(vesicle);
                     	tstep++;
-			//vesicle_free(vesicle);
                     free(number);
 			tape_free(vesicle->tape);
 			vesicle_free(vesicle);

--
Gitblit v1.9.3