From 0634b97e436e480b203a22e1113c473d3ae4d281 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:35:11 +0000
Subject: [PATCH] Merge branch 'nirgov' into HEAD

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

diff --git a/src/triangle.h b/src/triangle.h
index a3d8184..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
 
@@ -6,5 +7,5 @@
 ts_bool triangle_add_neighbour(ts_triangle *tria, ts_triangle *ntria);
 ts_bool triangle_normal_vector(ts_triangle *tria);
 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