]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2b8b8f 70171af)
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Fri, 29 Apr 2016 09:49:54 +0000 (12:49 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 29 Apr 2016 09:49:54 +0000 (12:49 +0300)
* PHP-7.0:
  Fixed condition

1  2 
sapi/cli/php_cli.c patch | diff1 | diff2 | blob | history

diff --cc sapi/cli/php_cli.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.