diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-08-05 21:26:11 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-08-05 21:26:11 -0700 |
| commit | 1e9abea1393f5a6a83d4def817a3768dc86eb357 (patch) | |
| tree | 00b22e3a99bfb9ee3d315baefaf1e4f24295e535 | |
| parent | 442629f81d7189fb39d1eba0b45c1ca9d82ca463 (diff) | |
| parent | 65cf73c93113cec7e4bca46ce8393c85f5e21fc5 (diff) | |
| download | php-git-1e9abea1393f5a6a83d4def817a3768dc86eb357.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.33-dev now
Conflicts:
configure.in
main/php_version.h
0 files changed, 0 insertions, 0 deletions