]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce5c450 8f1baa6)
Merge branch 'PHP-5.4' into PHP-5.5
authorJulien Pauli <jpauli@php.net>
Wed, 29 Jul 2015 08:04:08 +0000 (10:04 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 29 Jul 2015 08:04:08 +0000 (10:04 +0200)
* PHP-5.4:
  Adjust Git-Rules
  5.4.44 next

Conflicts:
configure.in
main/php_version.h


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