diff options
| author | Scott MacVicar <scottmac@php.net> | 2012-06-11 00:29:02 -0700 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2012-06-11 00:29:02 -0700 |
| commit | 32040b574e7b456ca7b03918adaabfec4bbd91e2 (patch) | |
| tree | 0ab4e10cc215dd09ff1dc24e6828c667d54b315b /ext/json/php_json.h | |
| parent | 2065bab102d2117340d5b604f0ac55941c78ced8 (diff) | |
| parent | f4847efc5d58b3375fa0f3269158d5e6ab625c21 (diff) | |
| download | php-git-32040b574e7b456ca7b03918adaabfec4bbd91e2.tar.gz | |
Merge branch '5.4'
* 5.4:
Add PBKDF2 support via openssl()
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions