summaryrefslogtreecommitdiffstats
path: root/application/errors
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-01-24 22:37:20 +0100
committerTimothy Warren <tim@timshomepage.net>2012-01-24 22:37:20 +0100
commit8f9e93dd37ae0090c9b4117138cd3135bfe3f67a (patch)
tree3f49040d696e760381642f2d2ffa407cee1dc039 /application/errors
parentde15a0b7377db0ef3b1d43508401be3c2927c0ff (diff)
parent96db8f91c34c18119548cacc4692362f51e70407 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/errors')
-rw-r--r--application/errors/error_404.php2
-rw-r--r--application/errors/error_db.php2
-rw-r--r--application/errors/error_general.php2
-rw-r--r--application/errors/error_php.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/application/errors/error_404.php b/application/errors/error_404.php
index eb98deb71..4dd8fc407 100644
--- a/application/errors/error_404.php
+++ b/application/errors/error_404.php
@@ -18,7 +18,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
* @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
* @link http://codeigniter.com
* @since Version 1.0
diff --git a/application/errors/error_db.php b/application/errors/error_db.php
index a53c38992..130ffc11d 100644
--- a/application/errors/error_db.php
+++ b/application/errors/error_db.php
@@ -18,7 +18,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
* @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
* @link http://codeigniter.com
* @since Version 1.0
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index 7d9a29f4e..2a844a8e2 100644
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -18,7 +18,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
* @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
* @link http://codeigniter.com
* @since Version 1.0
diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index 1bf245465..8e293cd5e 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -18,7 +18,7 @@
*
* @package CodeIgniter
* @author EllisLab Dev Team
- * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
* @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0)
* @link http://codeigniter.com
* @since Version 1.0