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/general.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/general.h b/src/general.h
index dccee34..4eab674 100644
--- a/src/general.h
+++ b/src/general.h
@@ -257,6 +257,7 @@
 	long int nczmax;
 	long int npoly;
 	long int nmono;
+	long int internal_poly;
 	long int nfil;
 	long int nfono;
 	long int R_nucleus;
@@ -313,6 +314,7 @@
 	ts_double R_nucleusX;
 	ts_double R_nucleusY;
 	ts_double R_nucleusZ;
+	ts_double nucleus_center[3];
     ts_double area;
 } ts_vesicle;
 

--
Gitblit v1.9.3