diff options
| author | Remi Collet <remi@php.net> | 2014-06-05 13:45:57 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-06-05 13:45:57 +0200 |
| commit | 9ea9064779a0de96079755694688a136487ba160 (patch) | |
| tree | c3327e95141960a67ef718b82c3b9b36a27f2c66 /win32/inet.h | |
| parent | 4b4a5bc1d367fc22528173f8b083eac3a2c29b60 (diff) | |
| parent | 3f47368738fe9123fb1b0a5d543ac7607295951d (diff) | |
| download | php-git-9ea9064779a0de96079755694688a136487ba160.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fix regression introduce in fix for bug #67118
Diffstat (limited to 'win32/inet.h')
0 files changed, 0 insertions, 0 deletions