]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d55b42b 9ff9905)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Fri, 20 Mar 2015 12:34:35 +0000 (13:34 +0100)
committerFerenc Kovacs <tyrael@php.net>
Fri, 20 Mar 2015 12:34:35 +0000 (13:34 +0100)
* PHP-5.5:
  add pear to the travis build

1  2 
travis/compile.sh patch | diff1 | diff2 | blob | history

diff --cc travis/compile.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.