sintonia/airtime_mvc
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
..
application Merge branch '2.1.x' into devel 2012-07-16 14:31:03 -04:00
build CC-430: Audio normalization (Replaygain Support) 2012-07-05 23:30:53 -04:00
library CC-3297: Depend on zendframework and php-pear as external packages 2012-02-06 20:28:38 -05:00
public Merge branch '2.1.x' into devel 2012-07-16 14:31:03 -04:00
tests CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00