sintonia/python_apps/media-monitor
Naomi Aro 69b4847df3 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' of dev.sourcefabric.org:airtime into cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention
Conflicts:
	python_apps/media-monitor/MediaMonitor.py
2011-06-08 10:23:52 +02:00
..
install cc-2055: switch to init.d 2011-06-03 11:30:08 -04:00
MediaMonitor.py Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' of dev.sourcefabric.org:airtime into cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention 2011-06-08 10:23:52 +02:00
airtime-media-monitor cc-2055: switch to init.d 2011-06-02 18:07:47 -04:00
airtime-media-monitor-init-d -remove apache2 as a daemon start prerequisite since apache may be remote. 2011-06-03 17:40:58 -04:00
logging.cfg cc-2055: switch to init.d 2011-06-02 18:07:47 -04:00
media-monitor.cfg CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 2011-06-06 11:26:16 +02:00