]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c932d53 4ed133c)
Merge branch 'PHP-5.4' into PHP-5.5
authorChristopher Jones <sixd@php.net>
Wed, 7 Aug 2013 20:14:46 +0000 (13:14 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 7 Aug 2013 20:14:46 +0000 (13:14 -0700)
* PHP-5.4:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.

1  2 
Makefile.global patch | diff1 | diff2 | blob | history

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