martin 5190a0c24c Merge branch '1.9.1' into devel ... Conflicts: airtime_mvc/application/controllers/ApiController.php airtime_mvc/application/models/MusicDir.php python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py		2011-10-04 13:59:27 -04:00
..
install	CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder	2011-09-28 12:15: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-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder	2011-09-28 12:15:13 -04:00
logging.cfg	cc-2055: switch to init.d	2011-06-02 18:07:47 -04:00
monit-airtime-show-recorder.cfg	CC-2888: Create a monit file for each airtime component	2011-09-26 14:40:26 -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-10-04 13:59:27 -04:00