From 091f7d56b288b83a32a2f7286ce532e5471ed49b Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Fri, 11 Apr 2014 08:10:45 +0000
Subject: [PATCH] Merge branch 'trout-rbc' of https://bitbucket.org/samop/trisurf-ng into trout-rbc

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

diff --git a/src/triangle.h b/src/triangle.h
index 5735581..a1a0fd0 100644
--- a/src/triangle.h
+++ b/src/triangle.h
@@ -5,7 +5,6 @@
 ts_triangle *triangle_add(ts_triangle_list *tlist, ts_vertex *vtx1, ts_vertex *vtx2, ts_vertex *vtx3);
 ts_bool triangle_add_neighbour(ts_triangle *tria, ts_triangle *ntria);
 ts_bool triangle_normal_vector(ts_triangle *tria);
-ts_bool triangle_data_free(ts_triangle_data *triang);
 ts_bool triangle_list_free(ts_triangle_list *tlist);
-
+ts_bool triangle_remove_neighbour(ts_triangle *tria, ts_triangle *ntria);
 #endif

--
Gitblit v1.9.3