Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel ... Conflicts: VERSION airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/models/Nowplaying.php airtime_mvc/application/models/Show.php airtime_mvc/application/models/airtime/CcShowInstances.php		2012-02-14 14:47:07 -05:00
..
media-monitor-copy-files.py	CC-3222: Add option to disable auto starting Airtime services (after install and after system restart)	2011-12-23 15:53:30 -05:00
media-monitor-initialize.py	Merge branch '2.0.x' into devel	2012-02-14 14:47:07 -05:00
media-monitor-remove-files.py	…
media-monitor-uninitialize.py	…
media-monitor-uninstall.py	…