diff options
| author | Reeze Xia <reeze@php.net> | 2015-03-03 11:44:52 +0800 |
|---|---|---|
| committer | Reeze Xia <reeze@php.net> | 2015-03-03 11:44:52 +0800 |
| commit | c6e415aeb2deb733636b9f181361ad4728971197 (patch) | |
| tree | 7b244e98f9e9ef98c20a30f9c4e22514efb445ab /ext/mysql/php_mysql.h | |
| parent | fa2450c5f817730a8c7016a88fe9dd02b09524e1 (diff) | |
| parent | 4e2c87edb34c4f151da6899d523c93b8e8565975 (diff) | |
| download | php-git-c6e415aeb2deb733636b9f181361ad4728971197.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
Conflicts:
main/main.c
Diffstat (limited to 'ext/mysql/php_mysql.h')
0 files changed, 0 insertions, 0 deletions