diff options
| author | Adam Harvey <aharvey@php.net> | 2015-01-08 19:16:32 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2015-01-08 19:16:32 +0000 |
| commit | 16b6f6c7f49a6a0e64ce2b20893eb794886c1376 (patch) | |
| tree | 1939b4ac820d4d70fca6be723c7c9c52dffdf653 /ext/xml/php_xml.h | |
| parent | 2e79820c0e1b72b7e1386d7648256b23768da49d (diff) | |
| parent | 8b0f10576113aa181429ce30fd16c8d90a914402 (diff) | |
| download | php-git-16b6f6c7f49a6a0e64ce2b20893eb794886c1376.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Calling crypt() with a salt of *0 should always return *1.
5.5.22 now
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/xml/php_xml.h')
0 files changed, 0 insertions, 0 deletions