]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea807f9 a12cef9)
Merge branch 'PHP-5.4' into PHP-5.5
authorJulien Pauli <jpauli@php.net>
Wed, 2 Sep 2015 15:55:20 +0000 (17:55 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 2 Sep 2015 15:55:20 +0000 (17:55 +0200)
* PHP-5.4:
  Merge branch 'PHP-5.6'
  bump version

Conflicts:
configure.in
main/php_version.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.