Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cc-84-smart-playlist' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Scheduler.php
This commit is contained in:
James 2012-07-18 12:23:57 -04:00
commit 9516771099
24 changed files with 4016 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/application/configs/classmap-airtime-conf.php
View file

@ -78,6 +78,13 @@ return array (
'BaseCcPlaylistcontentsPeer' => 'airtime/om/BaseCcPlaylistcontentsPeer.php',
'BaseCcPlaylistcontents' => 'airtime/om/BaseCcPlaylistcontents.php',
'BaseCcPlaylistcontentsQuery' => 'airtime/om/BaseCcPlaylistcontentsQuery.php',
'CcPlaylistcriteriaTableMap' => 'airtime/map/CcPlaylistcriteriaTableMap.php',
'CcPlaylistcriteriaPeer' => 'airtime/CcPlaylistcriteriaPeer.php',
'CcPlaylistcriteria' => 'airtime/CcPlaylistcriteria.php',
'CcPlaylistcriteriaQuery' => 'airtime/CcPlaylistcriteriaQuery.php',
'BaseCcPlaylistcriteriaPeer' => 'airtime/om/BaseCcPlaylistcriteriaPeer.php',
'BaseCcPlaylistcriteria' => 'airtime/om/BaseCcPlaylistcriteria.php',
'BaseCcPlaylistcriteriaQuery' => 'airtime/om/BaseCcPlaylistcriteriaQuery.php',
'CcPrefTableMap' => 'airtime/map/CcPrefTableMap.php',
'CcPrefPeer' => 'airtime/CcPrefPeer.php',
'CcPref' => 'airtime/CcPref.php',