]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53b1dce 2876bde)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Sat, 12 Apr 2014 23:57:15 +0000 (01:57 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sat, 12 Apr 2014 23:57:15 +0000 (01:57 +0200)
* PHP-5.5:
  fix typo

1  2 
main/SAPI.c patch | diff1 | diff2 | blob | history

diff --cc main/SAPI.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.