From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 17 Jul 2013 16:25:36 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.0~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a326f4217f3f89b9e935976759d12445dbaad5df;p=telecaster-server.git

Merge branch 'dev'

Conflicts:
	tcserver/conf/home/fluxbox/autostart.sh
---

a326f4217f3f89b9e935976759d12445dbaad5df
diff --cc tcserver/conf/home/fluxbox/autostart.sh
index 03e9fc6,535ce69..781816f
--- a/tcserver/conf/home/fluxbox/autostart.sh
+++ b/tcserver/conf/home/fluxbox/autostart.sh
@@@ -4,8 -6,7 +6,6 @@@
  
  pid=`pgrep jack-rack`
  
- # Audio channel
--
  if [ ! $pid = "" ]; then
   sleep 1
  else