diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2014-10-16 21:28:20 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2014-10-16 21:28:20 -0700 |
| commit | 560646662433d503a47075f4c2f8ee6760bd93fd (patch) | |
| tree | c4c102265ca1a97e848ba05c374d3297ff23082d /sapi/phpdbg/phpdbg_parser.c | |
| parent | 0d27b3ea698dbed6b1235f01d82984567aa2b569 (diff) | |
| parent | 2b5bffe6c70bc00ebe57390f48ef7569e401d2d3 (diff) | |
| download | php-git-560646662433d503a47075f4c2f8ee6760bd93fd.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.c')
0 files changed, 0 insertions, 0 deletions