diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-22 18:52:55 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-22 18:54:48 -0700 |
| commit | c6384a7908976c5339374e7449e4ad5f38934e49 (patch) | |
| tree | b9bff3b6810e76582640389395063956cef10796 /ext/xml/php_xml.h | |
| parent | fce9a856e73cfb6d9a4521d5b8ea2c15417f3145 (diff) | |
| parent | 1badfd8171119ef70a5d088068b9de88ba668f73 (diff) | |
| download | php-git-c6384a7908976c5339374e7449e4ad5f38934e49.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
Diffstat (limited to 'ext/xml/php_xml.h')
0 files changed, 0 insertions, 0 deletions