Merge branch 'devel' of dev.sourcefabric.org:airtime into cc-2528-use-virtualenv-for-installing

Conflicts:
	python_apps/media-monitor/airtime-media-monitor
This commit is contained in:
James 2011-07-19 15:09:55 -04:00
commit 107c100cc4
35 changed files with 842 additions and 290 deletions

View file

@ -10,7 +10,7 @@ recorder_user="pypo"
recorder_path="/usr/lib/airtime/show-recorder/"
recorder_script="recorder.py"
api_client_path="/usr/lib/airtime/pypo/"
api_client_path="/usr/lib/airtime/"
cd ${recorder_path}
exec 2>&1