From 737e1c8236e7e9b72cf08c5d173e0a307c38600c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 10 Jul 2012 12:34:47 +0000
Subject: [PATCH] Merge branch 'bondflip'

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

diff --git a/src/vertex.h b/src/vertex.h
index 98efff5..97775d2 100644
--- a/src/vertex.h
+++ b/src/vertex.h
@@ -24,7 +24,8 @@
 ts_bool vtx_set_global_values(ts_vesicle *vesicle);
 inline ts_double vtx_direct(ts_vertex *vtx1, ts_vertex *vtx2, ts_vertex *vtx3);
 inline ts_bool vertex_add_tristar(ts_vertex *vtx, ts_triangle *tristarmem);
-
+inline ts_bool vtx_insert_neighbour(ts_vertex *vtx, ts_vertex *nvtx, ts_vertex *vtxm);
+inline ts_bool vtx_remove_tristar(ts_vertex *vtx, ts_triangle *tristar);
 ts_bool vtx_copy(ts_vertex *cvtx,ts_vertex *ovtx);
 ts_bool vtx_duplicate(ts_vertex *cvtx, ts_vertex *ovtx);
 ts_vertex **vtx_neigh_copy(ts_vertex_list *vlist,ts_vertex *ovtx);

--
Gitblit v1.9.3