diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-12 12:18:09 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-12 12:18:09 +0800 |
| commit | f71fcf8bdd685eda621c5671f094ea7fdf2c36f4 (patch) | |
| tree | 612dffab0268790656ed3ea33b81d7600883ef40 /win32/php_stdint.h | |
| parent | 42902919bc0f97977e116415c9968dc6b23b12d2 (diff) | |
| parent | 7903276f4c18fcfda06c02785f0b4201421f9c7c (diff) | |
| download | php-git-f71fcf8bdd685eda621c5671f094ea7fdf2c36f4.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
backport to 5.6 (we should not unset the default value)
Conflicts:
Zend/zend_exceptions.c
ext/standard/tests/serialize/bug69152.phpt
Diffstat (limited to 'win32/php_stdint.h')
0 files changed, 0 insertions, 0 deletions