]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01dee2c 68b229e)
Merge branch 'PHP-5.4'
authorDmitry Stogov <dmitry@zend.com>
Fri, 26 Oct 2012 16:49:21 +0000 (09:49 -0700)
committerDmitry Stogov <dmitry@zend.com>
Fri, 26 Oct 2012 16:49:21 +0000 (09:49 -0700)
* PHP-5.4:
  Fixed bug #63180 (Corruption of hash tables)
  fix bug #63369

Conflicts:
NEWS

1  2 
ext/pcre/php_pcre.c patch | diff1 | diff2 | blob | history

diff --cc ext/pcre/php_pcre.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.