From c0d703a09da108f218b687beeec671f71b7a44c9 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 08 Mar 2014 18:25:50 +0000
Subject: [PATCH] Merge branch 'trisurf-polyel'

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

diff --git a/src/general.h b/src/general.h
index e7e9545..3308faa 100644
--- a/src/general.h
+++ b/src/general.h
@@ -3,7 +3,6 @@
 
 #include<stdarg.h>
 #include<stdio.h>
-
 /* @brief This is a header file, defining general constants and structures.
   * @file header.h
   * @author Samo Penic
@@ -260,8 +259,9 @@
 
 	ts_poly_list *poly_list;
 	ts_double spring_constant;
+	ts_double pressure;
+	ts_int pswitch;
 } ts_vesicle;
-
 
 
 

--
Gitblit v1.9.3