diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-02-26 22:26:36 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-02-26 22:26:36 -0800 |
| commit | 0d65a85cc0b1c789ad70e32c97a2a82064d80a9f (patch) | |
| tree | 343a8dbbcdf10efccf0860dd8f086128d34f2bb8 /ext/sockets/php_sockets.h | |
| parent | 84b65cf7abbecf0866f829f269f2208dcb44f5ca (diff) | |
| parent | 31a6f8b7f443ec03cd7ff7ed155dbeafd44c8557 (diff) | |
| download | php-git-0d65a85cc0b1c789ad70e32c97a2a82064d80a9f.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.13 branched, now it's 5.4.14
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/sockets/php_sockets.h')
0 files changed, 0 insertions, 0 deletions