diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-03-03 09:52:21 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-03-03 09:52:21 +0300 |
| commit | 035d80523f3ec1c5f1c071a7b2e71cbe3ef43461 (patch) | |
| tree | deabc9d674428dcdd7cff9da54a0d1fa8ae2e7a3 /ext/mysql/php_mysql.h | |
| parent | 34f09b62408759e9d8754ccdd790c6586507a4d2 (diff) | |
| parent | 0c136a2abd49298b66acb0cad504f0f972f5bfe8 (diff) | |
| download | php-git-035d80523f3ec1c5f1c071a7b2e71cbe3ef43461.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Added type checks
Conflicts:
ext/soap/soap.c
Diffstat (limited to 'ext/mysql/php_mysql.h')
0 files changed, 0 insertions, 0 deletions