From 1d32b65243c0ad55ae9516acaa349f4f7c823b72 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 18 Sep 2017 18:55:21 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/trilib'

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

diff --git a/src/restore.h b/src/restore.h
index 84c8747..b05c6a8 100644
--- a/src/restore.h
+++ b/src/restore.h
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #ifndef _H_RESTORE
 #define _H_RESTORE
 
@@ -8,7 +9,10 @@
 ts_bool parseTrisurfTria(ts_vesicle *vesicle, xmlDocPtr doc, xmlNodePtr cur);
 ts_bool parseTrisurfTriaNeigh(ts_vesicle *vesicle, xmlDocPtr doc, xmlNodePtr cur);
 ts_bool parseTrisurfTristar(ts_vesicle *vesicle, xmlDocPtr doc, xmlNodePtr cur);
+ts_bool parseXMLPointData(ts_vesicle *vesicle,xmlDocPtr doc, xmlNodePtr cur);
 ts_bool parseXMLVertexPosition(ts_vesicle *vesicle,xmlDocPtr doc, xmlNodePtr cur);
 ts_bool parseXMLBonds(ts_vesicle *vesicle,xmlDocPtr doc, xmlNodePtr cur);
-
+ts_bool parseTrisurfNucleus(ts_vesicle *vesicle, xmlDocPtr doc, xmlNodePtr cur);
+ts_bool parseTrisurfConstantVolume(xmlDocPtr doc, xmlNodePtr cur);
+ts_bool parseTrisurfConstantArea(xmlDocPtr doc, xmlNodePtr cur);
 #endif

--
Gitblit v1.9.3