]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorXinchen Hui <laruence@gmail.com>
Tue, 2 Jan 2018 05:57:56 +0000 (13:57 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 2 Jan 2018 05:57:56 +0000 (13:57 +0800)
* PHP-7.1:
  regenerated with newer re2c

1  2 
ext/pdo/pdo_sql_parser.c

Simple merge