From 80f2a33e4b55c7259bdb4bff66a0ce12b96edd80 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 11 Jul 2016 19:29:28 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng

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

diff --git a/src/triangle.h b/src/triangle.h
index 5735581..dd5280e 100644
--- a/src/triangle.h
+++ b/src/triangle.h
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #ifndef _TRIANGLE_H
 #define _TRIANGLE_H
 
@@ -5,7 +6,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