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

..

airtime-db-install.php

Merge branch '1.9.1' into devel

2011-08-24 10:30:59 -04:00

airtime-install.ini

CC-2518: Auto install script for manual install

2011-07-19 17:30:23 -04:00

airtime-install.php

CC-2621 : Support upgrades from 1.7.0

2011-08-05 15:09:02 -04:00

airtime-uninstall.php

CC-2518: Auto install script for manual install

2011-07-19 17:30:23 -04:00

airtime-upgrade.php

Merge branch '1.9.1' into devel

2011-08-24 10:30:59 -04:00

AirtimeIni.php

CC-2607: Abilitiy to adjust stream bitrate, type, etc from the UI

2011-08-15 16:10:46 -04:00

AirtimeInstall.php

Merge branch '1.9.1' into devel

2011-08-24 10:30:59 -04:00