From f6bc99c334f6481e40f547d0e91f771b9564aa38 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 05 Jul 2016 10:09:08 +0000
Subject: [PATCH] Merge branch 'clustercount' into nirgov

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

diff --git a/src/snapshot.h b/src/snapshot.h
index e4642e9..7bc617b 100644
--- a/src/snapshot.h
+++ b/src/snapshot.h
@@ -18,7 +18,8 @@
 ts_bool xml_trisurf_tria_neigh(ts_string *data, ts_triangle_list *tlist);
 ts_bool xml_trisurf_vtx_neigh(ts_string *data, ts_vertex_list *vlist);
 ts_bool xml_trisurf_vtx_tristar(ts_string *data, ts_vertex_list *vlist);
-
+ts_bool xml_trisurf_nucleus(ts_string *data, ts_vesicle* vesicle);
+ts_bool xml_trisurf_constvolarea(ts_string *data, ts_double volume, ts_double area);
 /* UTILITIES */
 char *base64_encode(const unsigned char *data, size_t input_length, size_t *output_length);
 unsigned char *base64_decode(const char *data, size_t input_length, size_t *output_length);

--
Gitblit v1.9.3