Naomi Aro d5a3aaf3d0 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel ... Conflicts: python_apps/media-monitor/MediaMonitor.py		2011-06-15 11:02:23 +02:00
..
install	cc-2055: switch to init.d	2011-06-03 11:30:08 -04:00
MediaMonitor.py	CC-1799 Put Airtime Storage into a Human Readable File Naming Convention	2011-06-15 09:19:41 +02:00
airtime-media-monitor	-python interpreter exceptions are now redirected to a file so	2011-06-08 12:33:38 -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-13 12:10:25 +02:00