]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 698b042 c0acb9d)
Merge branch 'PHP-5.5' into PHP-5.6
authorWill Fitch <willf@aweber.com>
Fri, 24 Jan 2014 02:35:24 +0000 (21:35 -0500)
committerWill Fitch <willf@aweber.com>
Fri, 24 Jan 2014 02:35:24 +0000 (21:35 -0500)
* PHP-5.5:
  Update gitignore and Makefile for additional entries

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.