diff options
| author | Julien Pauli <jpauli@php.net> | 2015-09-02 17:55:20 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-09-02 18:00:35 +0200 |
| commit | 46370d548b7803ca38901fe5839e18a3ab93aab5 (patch) | |
| tree | ceb6b127438df0b8810b8d8a2cbfaad633fdbb7d /README.SELF-CONTAINED-EXTENSIONS | |
| parent | 58b8d9d27eb2bcdf5de2197bbd80949c05ecb88d (diff) | |
| download | php-git-PHP-5.5.29.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5php-5.5.29PHP-5.5.29
* PHP-5.4:
Merge branch 'PHP-5.6'
bump version
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'README.SELF-CONTAINED-EXTENSIONS')
0 files changed, 0 insertions, 0 deletions