diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:35:11 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:35:11 -0800 |
| commit | 87d8e9208c4af72303c5f5353f98f9e04e038047 (patch) | |
| tree | f67f821464b916c3d6b596af1672aa153327d5b4 /ext/mysql/php_mysql.c | |
| parent | b68e7bd7ba481dac7e84beab9c951cde1ffc28d9 (diff) | |
| parent | 55d5811f85d8ef5934a430ef6d3604c942a4b2d3 (diff) | |
| download | php-git-87d8e9208c4af72303c5f5353f98f9e04e038047.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix TSRM
Conflicts:
ext/standard/dns.c
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions