diff options
| author | Pierrick Charron <pierrick@php.net> | 2012-12-21 12:24:52 -0500 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2012-12-21 12:24:52 -0500 |
| commit | 59a4514dc0e8950ce210036332cc64c414fdcc22 (patch) | |
| tree | 191713b901805f743e00f11414305c7d510bae09 /ext/curl/php_curl.h | |
| parent | 763bce0303b3afd19d109d96c37d6d33a899e990 (diff) | |
| parent | 63659ce52678500ec024f1146ebf30e70624b935 (diff) | |
| download | php-git-59a4514dc0e8950ce210036332cc64c414fdcc22.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix test to work on every libcurl version
- Fixed typo on "SKIPIF" (causing make test to abort on some systems)
Conflicts:
tests/output/bug63377.phpt
Diffstat (limited to 'ext/curl/php_curl.h')
0 files changed, 0 insertions, 0 deletions