From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.

---
 src/poly.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/poly.h b/src/poly.h
index 89392ba..26dd444 100644
--- a/src/poly.h
+++ b/src/poly.h
@@ -1,14 +1,19 @@
 #ifndef _POLY_H
 #define _POLY_H
+#include"io.h"
 
 #include"general.h"
 
 ts_poly	*init_poly(ts_uint n, ts_vertex *grafted_vtx);
 
-ts_poly_list *init_poly_list(ts_uint n_poly, ts_uint n_mono, ts_vertex_list *vlist);
+ts_poly_list *init_poly_list(ts_uint n_poly, ts_uint n_mono, ts_vertex_list *vlist, ts_vesicle *vesicle);
 
 ts_bool poly_free(ts_poly *poly);
 
 ts_bool poly_list_free(ts_poly_list *poly_list);
 
+ts_bool poly_assign_spring_const(ts_vesicle *vesicle);
+
+ts_bool poly_assign_filament_xi(ts_vesicle *vesicle, ts_tape *tape);
+
 #endif

--
Gitblit v1.9.3