diff options
author | Dmitry Stogov <dmitry@zend.com> | 2014-06-05 20:54:50 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2014-06-05 20:54:50 +0400 |
commit | 717839735f92489227144fc6ae9ef1b4f637816a (patch) | |
tree | 30204a7ce866032cfc7928d16d1e21c7e12aca47 /ext/pcre/php_pcre.h | |
parent | 1b8916886b5b3b88ebe016ea311951b21db93ddd (diff) | |
parent | e16097626a7e86e0baa9fa7d17477b6ffc13c706 (diff) | |
download | php-git-717839735f92489227144fc6ae9ef1b4f637816a.tar.gz |
Merge branch 'master' into phpng
* master: (29 commits)
drop exec perm on doc files
fix test for 5.4/5.5
restore correct behavior of DateTime
fix test use invalid code
add test for previous fix
NEWS
NEWS
NEWS
Fix regression introduce in fix for bug #67118
update news
update NEWS
Fix tests
Fix possible segfault depending on memory location...
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)
fix gcov data with some locales (again)
fix gcov data with some locales (again)
Update NEWS
Fixed startup segfault in non-debug builds Fixes issue #87
...
Diffstat (limited to 'ext/pcre/php_pcre.h')
0 files changed, 0 insertions, 0 deletions