From 8c2d3c9587f6c882f489af7bca989d73b93688b0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 24 Apr 2015 17:14:04 +0100
Subject: [PATCH 1/2] Added details about dev branch

---
 Arma3/arma3server | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Arma3/arma3server b/Arma3/arma3server
index 2c0125374..5ca373487 100644
--- a/Arma3/arma3server
+++ b/Arma3/arma3server
@@ -4,7 +4,7 @@
 # Author: Daniel Gibbs
 # Contributor: Scarsz
 # Website: http://danielgibbs.co.uk
-# Version: 200315
+# Version: 240415
 
 #### Variables ####
 
@@ -27,7 +27,7 @@ parms="-netlog -ip=${ip} -cfg=${networkcfgfullpath} -config=${servercfgfullpath}
 #### Advanced Variables ####
 
 # ARMA 3 Modules
-# add mods with relative paths: 
+# add mods with relative paths:
 # mods/\@CBA_A3\;
 # or several mods as:
 # mods/\@CBA_A3\;mods/\@task_force_radio
@@ -35,7 +35,10 @@ parms="-netlog -ip=${ip} -cfg=${networkcfgfullpath} -config=${servercfgfullpath}
 mods=""
 
 # Steam
+# Stable
 appid="233780"
+# Development
+# appid="233780 -beta development"
 
 # Server Details
 servicename="arma3-server"

From 4f3fb109c1ea329cfee0944263f74e12baa7769b Mon Sep 17 00:00:00 2001
From: Marvin <xfanatiix@gmail.com>
Date: Sat, 25 Apr 2015 16:51:50 +0200
Subject: [PATCH 2/2] fixed wrong else position

Fixed an 'else' that belonged to a wrong 'if block'. Introduced with 2799224afa8b75be71dde30e0a9d9e96c7e9fc51
---
 functions/fn_start | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/functions/fn_start b/functions/fn_start
index b250533f6..e4a428b95 100644
--- a/functions/fn_start
+++ b/functions/fn_start
@@ -166,10 +166,10 @@ if [ "${tmuxwc}" -eq 0 ]; then
 				fn_scriptlog "http://gameservermanagers.com/issues"
 			fi
 		fi
-	else
-		fn_printok "${servername}"
-		fn_scriptlog "Started ${servername}"
 	fi
+else
+	fn_printok "${servername}"
+	fn_scriptlog "Started ${servername}"	
 fi
 #rm "${scriptlogdir}/.${servicename}-tmux-error.tmp"
 echo -en "\n"
@@ -179,4 +179,4 @@ if [ "${gamename}" == "Teamspeak 3" ]; then
 	fn_start_teamspeak3
 else
 	fn_start_tmux
-fi
\ No newline at end of file
+fi