martin 9c7bab616d Merge branch '1.9.1' into devel ...

Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ScheduleController.php
	install_minimal/airtime-install
	install_minimal/include/AirtimeInstall.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

2011-09-09 15:07:43 -04:00

..

install

CC-2760: Remove shebangs from files that don't need them, fix chmod of files

2011-09-06 19:06:13 -04:00

airtime-show-recorder

CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts

2011-09-08 12:36:51 -04:00

airtime-show-recorder-init-d

CC-2410: Clean up install process

2011-06-20 17:38:18 -04:00

logging.cfg

cc-2055: switch to init.d

2011-06-02 18:07:47 -04:00

recorder.cfg

CC-2590 : Make bitrate for liquidsoap and show-recorder adjustable from the config file

2011-07-26 18:39:26 +02:00

recorder.py

Merge branch '1.9.1' into devel

2011-09-09 15:07:43 -04:00