]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 117d2dd 2a59f1d)
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Fri, 16 Nov 2012 03:29:48 +0000 (19:29 -0800)
committerChristopher Jones <sixd@php.net>
Fri, 16 Nov 2012 03:29:48 +0000 (19:29 -0800)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Skip test if directory does not exist
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  UPdated NEWS
  Updated NEWS


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.