From 3096998157b37ad4d6c1af9ce32e657407795d5d Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 07 Jun 2012 13:43:50 +0000
Subject: [PATCH] Merge branch 'Ylmi2sh'

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

diff --git a/src/cell.h b/src/cell.h
index 660792b..76ba105 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -7,6 +7,5 @@
 ts_bool cell_add_vertex(ts_cell *cell, ts_vertex *vtx);
 ts_bool cell_list_cell_occupation_clear(ts_cell_list *clist);
 
-//ts_bool cell_occupation_number_and_internal_proximity(ts_cell_list *clist,
-//ts_uint cellidx, ts_vertex *vtx, ts_vertex *tvtx);
+ts_bool cell_occupation_number_and_internal_proximity(ts_cell_list *clist, ts_uint cellidx, ts_vertex *vtx, ts_vertex *tvtx);
 #endif

--
Gitblit v1.9.3