diff options
| author | Anatol Belski <ab@php.net> | 2014-06-06 09:06:48 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-06-06 09:06:48 +0200 |
| commit | 0e7bf92129f608c44f4d5bd51139ec2bd85fecc8 (patch) | |
| tree | c68de7597245cd0f5ce5e59821dffc6f8bb38834 /sapi/phpdbg | |
| parent | df0794469d321a3f8dc0e82ed6a0532e85cbd030 (diff) | |
| parent | e16097626a7e86e0baa9fa7d17477b6ffc13c706 (diff) | |
| download | php-git-0e7bf92129f608c44f4d5bd51139ec2bd85fecc8.tar.gz | |
Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
restore correct behavior of DateTime
fix test use invalid code
Fixed startup segfault in non-debug builds Fixes issue #87
PHP 5.4/5.5 compability in phpdbg_watch.c
fix gcov data with some locales (again)
Conflicts:
ext/date/php_date.c
Diffstat (limited to 'sapi/phpdbg')
0 files changed, 0 insertions, 0 deletions