diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-12-17 02:13:13 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-12-17 02:13:13 +0100 |
| commit | 925fa271ec500543da946e5bd0230fcaf853f551 (patch) | |
| tree | f24d191119f97374a060039fe5855ae26e424291 | |
| parent | 8efd73c4d219e809167eda733bd74c3f2c0dc64e (diff) | |
| parent | cd387b457572709cbaaaee15ccc0db1185a3c23a (diff) | |
| download | php-git-925fa271ec500543da946e5bd0230fcaf853f551.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add missing NEWS entry
5.4.37
Conflicts:
configure.in
main/php_version.h
0 files changed, 0 insertions, 0 deletions