]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ef57f8 6772fbf)
Merge branch 'PHP-5.6' into PHP-7.0
authorLior Kaplan <kaplanlior@gmail.com>
Mon, 8 Feb 2016 18:29:24 +0000 (20:29 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Mon, 8 Feb 2016 18:29:24 +0000 (20:29 +0200)
* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393

1  2 
Makefile.global patch | diff1 | diff2 | blob | history
sapi/fpm/Makefile.frag patch | diff1 | diff2 | blob | history

diff --cc Makefile.global
Simple merge
diff --cc sapi/fpm/Makefile.frag
Simple merge
Unnamed repository; edit this file 'description' to name the repository.