paul.baranowski b6d117d456 Fixed merge conflicts

2011-02-14 13:16:57 +01:00

..

ACL.php

-added help page

2011-02-11 18:13:26 -05:00

airtime-conf.php

can make show as many hours long in duration as wanted.

2011-02-12 18:40:17 -05:00

application.ini

-updated to use new database name, login and passwd (all 3 are "airtime"). You may delete old database by typing "dropdb -U campcaster -h localhost campcaster"

2011-01-05 19:05:57 -05:00

classmap-airtime-conf.php

removed cc_show_schedule table.

2011-02-06 22:07:17 -05:00

conf.php

initial patch to fix problems with new tables schema.

2011-02-06 19:28:39 -05:00

constants.php

adding zend project folders into old campcaster.

2010-12-07 14:19:27 -05:00

navigation.php

Fixed merge conflicts

2011-02-14 13:16:57 +01:00