From ff8152b46e7957beffeafca580abc90df47d9d28 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 21 Mar 2014 21:15:31 +0000
Subject: [PATCH] Merge branch 'trisurf-polyel'

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

diff --git a/src/bondflip.h b/src/bondflip.h
index 8d7ee37..947555f 100644
--- a/src/bondflip.h
+++ b/src/bondflip.h
@@ -3,5 +3,5 @@
 
 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