diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-30 21:12:17 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-30 21:12:17 -0800 |
| commit | 3003793480f762f3f31d10f97ce89fa1cb113fab (patch) | |
| tree | 8925fa1709923258ed023697723340c8568127e3 /ext/mssql/php_mssql.c | |
| parent | 4d162a2d9bb48598410b53e8967f4ca4fa2442e2 (diff) | |
| parent | 39007e23a4e4c34e83b05d37ef63a9c71e869270 (diff) | |
| download | php-git-3003793480f762f3f31d10f97ce89fa1cb113fab.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update news
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
Diffstat (limited to 'ext/mssql/php_mssql.c')
0 files changed, 0 insertions, 0 deletions