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/vertex.h |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/vertex.h b/src/vertex.h
index 7f494c6..97775d2 100644
--- a/src/vertex.h
+++ b/src/vertex.h
@@ -30,7 +30,5 @@
 ts_bool vtx_duplicate(ts_vertex *cvtx, ts_vertex *ovtx);
 ts_vertex **vtx_neigh_copy(ts_vertex_list *vlist,ts_vertex *ovtx);
 ts_vertex_list *vertex_list_copy(ts_vertex_list *ovlist);
-ts_bool vertex_taint(ts_vertex *vtx, ts_uint level);
-ts_bool vertex_untaint(ts_vertex *vtx, ts_uint level);
-inline ts_bool vertex_tainted(ts_vertex *vtx, ts_uint level, ts_uint amount);
+
 #endif

--
Gitblit v1.9.3