diff options
| author | Reeze Xia <reeze@php.net> | 2015-03-01 15:15:03 +0800 |
|---|---|---|
| committer | Reeze Xia <reeze@php.net> | 2015-03-01 15:15:03 +0800 |
| commit | 7109a39ddb3b89e4111d379f6ce4004149fd0901 (patch) | |
| tree | 345a1125e506730791f39b32d1ecb086bafd967b /ext/mysql/php_mysql.c | |
| parent | 54e2020ee3e6142a86db03f1a9d47bc763334dbb (diff) | |
| parent | 214350f4f44c006b1db2208e93bfaed6960b01b2 (diff) | |
| download | php-git-7109a39ddb3b89e4111d379f6ce4004149fd0901.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Bump header year
Update NEWS
Conflicts:
NEWS
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions