summaryrefslogtreecommitdiffstats
path: root/user_guide_src/cilexer
diff options
context:
space:
mode:
authorAhmad Anbar <aanbar@gmail.com>2015-01-11 18:39:06 +0100
committerAhmad Anbar <aanbar@gmail.com>2015-01-11 18:39:06 +0100
commitc8e1de74b139dc7f3e776f7ebf98495ec5b780a6 (patch)
tree51709a1855d570ba495d81a172a029015341c2bd /user_guide_src/cilexer
parentfaa4890addbaa90254ef160813a08f727d069415 (diff)
parent99f31e76bd06876cd3bf789f9d2774f79818b7df (diff)
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'user_guide_src/cilexer')
-rw-r--r--user_guide_src/cilexer/cilexer/cilexer.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/user_guide_src/cilexer/cilexer/cilexer.py b/user_guide_src/cilexer/cilexer/cilexer.py
index e4d25d772..2580b0b30 100644
--- a/user_guide_src/cilexer/cilexer/cilexer.py
+++ b/user_guide_src/cilexer/cilexer/cilexer.py
@@ -1,10 +1,12 @@
# CodeIgniter
# http://codeigniter.com
#
-# An open source application development framework for PHP 5.2.4 or newer
+# An open source application development framework for PHP
#
# This content is released under the MIT License (MIT)
#
+# Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
@@ -24,7 +26,7 @@
# THE SOFTWARE.
#
# Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
-# Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/)
+# Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
#
# http://opensource.org/licenses/MIT MIT License