]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb23147 a8d001a)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Tue, 10 Feb 2015 09:36:25 +0000 (10:36 +0100)
committerFerenc Kovacs <tyrael@php.net>
Tue, 10 Feb 2015 09:36:25 +0000 (10:36 +0100)
commitac54df17df8aad2b71941def3a4552705682796f
tree6d193d3dbb41f6c145f19f0bae26f42fb62be5c3tree | snapshot
parentfb2314798e28b4970cb35497ebc615dffc48d930commit | diff
parenta8d001aedfa06aa024e6488233dd46af7db7bb19commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add make install

Conflicts:
travis/compile.sh
travis/compile.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.