sintonia/python_apps/media-monitor/airtimefilemonitor
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
..
__init__.py cc-1799 Human Readable File System 2011-06-23 17:33:05 +02:00
airtimemediamonitorbootstrap.py Merge branch '2.1.x' into devel 2012-07-16 14:31:03 -04:00
airtimemetadata.py Merge branch '2.1.x' into devel 2012-07-16 14:31:03 -04:00
airtimenotifier.py Merge branch '2.1.x' into devel 2012-07-16 14:31:03 -04:00
airtimeprocessevent.py CC-430: Audio normalization (Replaygain Support) 2012-07-05 21:54:44 -04:00
mediaconfig.py CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder 2012-05-14 16:09:49 -04:00
mediamonitorcommon.py Merge branch '2.1.x' into devel 2012-07-16 14:31:03 -04:00
replaygain.py CC-430: Audio normalization (Replaygain Support) 2012-07-12 17:58:29 -04:00
replaygainupdater.py CC-430: Audio normalization (Replaygain Support) 2012-07-12 17:58:29 -04:00
workerprocess.py CC-430: Audio normalization (Replaygain Support) 2012-07-05 21:54:44 -04:00