]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Wed, 10 Jun 2015 22:13:40 +0000 (00:13 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 10 Jun 2015 22:13:40 +0000 (00:13 +0200)
* PHP-5.5:
  make it possible to set the re2c and yacc paths via environment variables for genfiles


Trivial merge