]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 294e7c2 15e31d5)
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Fri, 17 Aug 2012 18:36:07 +0000 (20:36 +0200)
committerAnatoliy Belsky <ab@php.net>
Fri, 17 Aug 2012 18:36:07 +0000 (20:36 +0200)
* PHP-5.4:
  More intl tests extracted from symfony
  Update version numbers to 5.4.7-dev.

Conflicts:
configure.in
main/php_version.h


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