From 5ec690fdf8f463a02c4e4d5505d5486b9a5bbd70 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 08 Jul 2014 16:21:14 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng into cross-section

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

diff --git a/src/bondflip.h b/src/bondflip.h
index 6713c31..947555f 100644
--- a/src/bondflip.h
+++ b/src/bondflip.h
@@ -1,7 +1,7 @@
-#ifdef _H_BONDFLIP
+#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