Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel ... Conflicts: VERSION airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/models/Nowplaying.php airtime_mvc/application/models/Show.php airtime_mvc/application/models/airtime/CcShowInstances.php		2012-02-14 14:47:07 -05:00
..
application	Merge branch '2.0.x' into devel	2012-02-14 14:47:07 -05:00
build	CC-3174 : showbuilder	2012-02-04 21:26:21 +01: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.0.x' into devel	2012-02-14 14:47:07 -05: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