From 0634b97e436e480b203a22e1113c473d3ae4d281 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:35:11 +0000
Subject: [PATCH] Merge branch 'nirgov' into HEAD

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

diff --git a/src/bondflip.h b/src/bondflip.h
index 6713c31..a0e0f08 100644
--- a/src/bondflip.h
+++ b/src/bondflip.h
@@ -1,7 +1,8 @@
-#ifdef _H_BONDFLIP
+/* 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, ts_double w_energy);
 #endif

--
Gitblit v1.9.3