James 73a7a76078 Merge branch 'CC-3963' into 2.1.x ... Conflicts: airtime_mvc/public/js/airtime/preferences/streamsetting.js		2012-06-14 16:06:53 -04:00
..
application	Merge branch 'CC-3963' into 2.1.x	2012-06-14 16:06:53 -04:00
build	CC-3859: Playout History: Filter out songs that are not played out	2012-05-22 16:11:25 -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 'CC-3963' into 2.1.x	2012-06-14 16:06:53 -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