From 6705af6d3d02e47a797c53146666a1d168e1aefc Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 06 Mar 2014 08:56:37 +0000
Subject: [PATCH] Merge branch 'trisurf-polyel'. It is the most debugged version. True, without polymeres dump may not work yet, still, from scratch with polymeres set to 0, there should be minimal time penalty.

---
 src/energy.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/energy.h b/src/energy.h
index 90463d8..8a37b85 100644
--- a/src/energy.h
+++ b/src/energy.h
@@ -2,4 +2,5 @@
 #define _ENERGY_H
 ts_bool mean_curvature_and_energy(ts_vesicle *vesicle);
 inline ts_bool energy_vertex(ts_vertex *vtx);
+inline ts_bool bond_energy(ts_bond *bond,ts_poly *poly);
 #endif

--
Gitblit v1.9.3