diff options
| author | Julien Pauli <jpauli@php.net> | 2016-07-12 11:17:36 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-07-12 11:17:36 +0200 |
| commit | ec285762605e5fdda747f2c9923609be8c4e7354 (patch) | |
| tree | ab8b31e81329d2fbaad56a78578e1c45ad879390 /win32/php_stdint.h | |
| parent | 932191a6ed93ec2f10c78a866775f6fc750fad96 (diff) | |
| parent | 17d4f5c2f83469764de63b221d2314ac3443d8db (diff) | |
| download | php-git-ec285762605e5fdda747f2c9923609be8c4e7354.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT.
Conflicts:
ext/pdo/pdo_stmt.c
Diffstat (limited to 'win32/php_stdint.h')
0 files changed, 0 insertions, 0 deletions