From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.

---
 src/frame.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/frame.h b/src/frame.h
index e69de29..b0e451c 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -0,0 +1,6 @@
+#ifndef _H_FRAME
+#define _H_FRAME
+ts_bool centermass(ts_vesicle *vesicle);
+ts_bool cell_occupation(ts_vesicle *vesicle);
+
+#endif

--
Gitblit v1.9.3