summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2014-01-03 11:09:07 +0800
committerXinchen Hui <laruence@php.net>2014-01-03 11:09:07 +0800
commit0f53e37494e5cb280cb37c4ab15fe82e0c92a69e (patch)
tree0a2d58a2239481f947326143f3e9ec289b5b5a43 /main/php_ini.c
parentc9f909cd4297cee26c0033efaa31e45d6ec8d9f2 (diff)
parentc081ce628f0d76d44784d7bb8e06428b06142ac0 (diff)
downloadphp-git-0f53e37494e5cb280cb37c4ab15fe82e0c92a69e.tar.gz
Merge branch 'PHP-5.6'
Diffstat (limited to 'main/php_ini.c')
-rw-r--r--main/php_ini.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index 2bdd3ae660..3bcb249f84 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2013 The PHP Group |
+ | Copyright (c) 1997-2014 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |