diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-17 13:52:25 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-17 13:52:25 -0700 |
| commit | fec93992de67a3bc30559e0a741b6ca5e0db8025 (patch) | |
| tree | c53a81201748b97aa7dcf07f10bf09bedea558aa /scripts/php-config.in | |
| parent | 31edf4df56a82d92631e25e7dd7c2bf6c8e00b99 (diff) | |
| parent | b9e3f737d95ba1d6e8e3e3ec4af6d5624dc50234 (diff) | |
| download | php-git-fec93992de67a3bc30559e0a741b6ca5e0db8025.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.19 is next
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'scripts/php-config.in')
0 files changed, 0 insertions, 0 deletions