]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26f4e40 d7b01af)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Thu, 2 Oct 2014 20:32:18 +0000 (22:32 +0200)
committerFerenc Kovacs <tyrael@php.net>
Thu, 2 Oct 2014 20:32:18 +0000 (22:32 +0200)
* PHP-5.5:
  we also have xz release tarballs since 5.5
  5.5.19 now

Conflicts:
configure.in
main/php_version.h

1  2 
.gitignore patch | diff1 | diff2 | blob | history

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