James 9eb21cb327 Merge branch '1.9.1' into devel ... Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/models/Preference.php install_minimal/include/airtime-db-install.php install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py		2011-08-24 10:30:59 -04:00
..
application	Merge branch '1.9.1' into devel	2011-08-24 10:30:59 -04:00
build	CC-2607: Ability to adjust stream bitrate,type,etc from the UI interface	2011-08-19 16:35:23 -04:00
library	CC-2692: Integrate ZFDebug into Airtime	2011-08-22 10:12:53 -04:00
public	Merge branch '1.9.1' into devel	2011-08-24 10:30:59 -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