From e818ba5bcc461af545665c78157be4e52252aa1c Mon Sep 17 00:00:00 2001
From: Miha <miha.fosnaric@fe.uni-lj.si>
Date: Mon, 11 Jul 2016 11:52:30 +0000
Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/samop/trisurf-ng

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

diff --git a/src/bondflip.h b/src/bondflip.h
index 8d7ee37..e3bb19d 100644
--- a/src/bondflip.h
+++ b/src/bondflip.h
@@ -1,7 +1,8 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #ifndef _H_BONDFLIP
 #define _H_BONDFLIP
 
 ts_bool single_bondflip_timestep(ts_vesicle *vesicle, ts_bond *bond, ts_double *rn);
 
-ts_bool ts_flip_bond(ts_vertex *k,ts_vertex *it,ts_vertex *km, ts_vertex *kp, ts_bond *bond);
+ts_bool ts_flip_bond(ts_vertex *k,ts_vertex *it,ts_vertex *km, ts_vertex *kp, ts_bond *bond, ts_triangle *lm, ts_triangle *lp, ts_triangle *lm2, ts_triangle *lp1);
 #endif

--
Gitblit v1.9.3