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
..
__init__.py	cc-1799 Human Readable File System	2011-06-23 17:33:05 +02:00
airtimemediamonitorbootstrap.py	CC-2977: Never delete files from the database	2012-01-12 17:55:05 -05:00
airtimemetadata.py	CC-3282: Issue with file causing media-monitor to crash (Spotted on Resonance FM)	2012-02-07 13:37:27 -05:00
airtimenotifier.py	CC-3299: Media monitor should not change the owner of watched files	2012-02-08 17:43:32 -05:00
airtimeprocessevent.py	CC-3299: Media monitor should not change the owner of watched files	2012-02-08 15:16:11 -05:00
mediaconfig.py	cc-2882: Airtime cannot delete watched folder when is been renamed	2011-09-29 15:02:30 -04:00
mediamonitorcommon.py	Merge branch '2.0.x' into devel	2012-02-14 14:47:07 -05:00
workerprocess.py	CC-1799 : Live Studio Playout from media library (pytagsfs)	2011-07-05 15:48:50 -04:00