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

@ -5,7 +5,7 @@ virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
ls_user="pypo"
export HOME="/var/tmp/airtime/pypo/"
api_client_path="/usr/lib/airtime/pypo/"
api_client_path="/usr/lib/airtime/"
ls_path="/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap"
ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"