diff options
author | Xinchen Hui <laruence@gmail.com> | 2016-08-26 18:32:54 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2016-08-26 18:32:54 +0800 |
commit | 557f1ccf0cc185d712597e11ecedff3171a69110 (patch) | |
tree | 6c361c8212070a51de2d8618cd8371d4de382adb /ext/sqlite3/php_sqlite3_structs.h | |
parent | 726e3b8ff0195bfa97b072cb6f986948cd49d8a9 (diff) | |
parent | c67fa3c91d314fd932fa1c921497fe3e6a968785 (diff) | |
download | php-git-557f1ccf0cc185d712597e11ecedff3171a69110.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72943 (assign_dim on string doesn't reset hval)
Conflicts:
Zend/zend_execute.c
Diffstat (limited to 'ext/sqlite3/php_sqlite3_structs.h')
0 files changed, 0 insertions, 0 deletions