summaryrefslogtreecommitdiffstats
path: root/system/core/Controller.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-10-21 10:45:48 +0200
committerTimothy Warren <tim@timshomepage.net>2011-10-21 10:45:48 +0200
commit0f6659ddfce7214f74aab20ab24a9a88c93059f5 (patch)
tree4762feb2d00550036a9d4ce1383cb2986d23b321 /system/core/Controller.php
parentd1a5ba2678c88e507d05b6d0235ee91b4b4db311 (diff)
parentf4a4bd8fac188ebc9cda822ffc811c218fd92b45 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Controller.php')
-rw-r--r--system/core/Controller.php20
1 files changed, 16 insertions, 4 deletions
diff --git a/system/core/Controller.php b/system/core/Controller.php
index fddb81e19..ca2bf41b5 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -4,10 +4,22 @@
*
* An open source application development framework for PHP 5.1.6 or newer
*
+ * NOTICE OF LICENSE
+ *
+ * Licensed under the Open Software License version 3.0
+ *
+ * This source file is subject to the Open Software License (OSL 3.0) that is
+ * bundled with this package in the files license.txt / license.rst. It is
+ * also available through the world wide web at this URL:
+ * http://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to obtain it
+ * through the world wide web, please send an email to
+ * licensing@ellislab.com so we can send you a copy immediately.
+ *
* @package CodeIgniter
- * @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
- * @license http://codeigniter.com/user_guide/license.html
+ * @author EllisLab Dev Team
+ * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
* @link http://codeigniter.com
* @since Version 1.0
* @filesource
@@ -24,7 +36,7 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Libraries
- * @author ExpressionEngine Dev Team
+ * @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/general/controllers.html
*/
class CI_Controller {