]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 763bce0 63659ce)
Merge branch 'PHP-5.3' into PHP-5.4
authorPierrick Charron <pierrick@php.net>
Fri, 21 Dec 2012 17:24:52 +0000 (12:24 -0500)
committerPierrick Charron <pierrick@php.net>
Fri, 21 Dec 2012 17:24:52 +0000 (12:24 -0500)
commit59a4514dc0e8950ce210036332cc64c414fdcc22
tree191713b901805f743e00f11414305c7d510bae09tree | snapshot
parent763bce0303b3afd19d109d96c37d6d33a899e990commit | diff
parent63659ce52678500ec024f1146ebf30e70624b935commit | diff
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
ext/standard/tests/file/bug52820.phpt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.