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

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source 
Conflicts:
	application/controllers/LibraryController.php
	application/controllers/SearchController.php
This commit is contained in:
naomiaro 2011-01-06 01:05:34 -05:00
commit d9e8e1641a
76 changed files with 238 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

12
application/models/Playlist.php
View file

@ -7,7 +7,7 @@ define('INDCH', ' ');
*
* remark: dcterms:extent format: hh:mm:ss.ssssss
*
* @package Campcaster
* @package Airtime
* @subpackage StorageServer
* @copyright 2010 Sourcefabric O.P.S.
* @license http://www.gnu.org/licenses/gpl.txt
@ -904,7 +904,7 @@ class Playlist {
} // class Playlist
/**
* @package Campcaster
* @package Airtime
* @subpackage StorageServer
* @copyright 2010 Sourcefabric O.P.S.
* @license http://www.gnu.org/licenses/gpl.txt
@ -1014,7 +1014,7 @@ class PlaylistTagExport
/**
* @package Campcaster
* @package Airtime
* @subpackage StorageServer
* @copyright 2010 Sourcefabric O.P.S.
* @license http://www.gnu.org/licenses/gpl.txt
@ -1195,7 +1195,7 @@ class PlaylistElementExport {
/**
* @package Campcaster
* @package Airtime
* @subpackage StorageServer
* @copyright 2010 Sourcefabric O.P.S.
* @license http://www.gnu.org/licenses/gpl.txt
@ -1269,7 +1269,7 @@ class PlaylistAudioClipExport
/**
* @package Campcaster
* @package Airtime
* @subpackage StorageServer
* @copyright 2010 Sourcefabric O.P.S.
* @license http://www.gnu.org/licenses/gpl.txt
@ -1303,7 +1303,7 @@ class PlaylistFadeInfoExport
/**
* @package Campcaster
* @package Airtime
* @subpackage StorageServer
* @copyright 2010 Sourcefabric O.P.S.
* @license http://www.gnu.org/licenses/gpl.txt