diff options
| author | Anatol Belski <ab@php.net> | 2014-05-12 08:55:10 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-05-12 08:55:10 +0200 |
| commit | a582692720b0b8b857b755d507a982c130e3a425 (patch) | |
| tree | d4f0e5335ccf1b9bd2a1cc81794311781a7db52b /sapi/phpdbg/phpdbg_help.c | |
| parent | ede2963963ba8ef88f9ab4df7e7ba0f26413d2bc (diff) | |
| parent | 27f5957e9f5e8526033d946aaa02ad3bb07023b6 (diff) | |
| download | php-git-a582692720b0b8b857b755d507a982c130e3a425.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
Allow crypto_method context value in stream_socket_enable_crypto()
Conflicts:
ext/standard/streamsfuncs.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions