]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86685ae 4e773c1)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 29 Apr 2013 05:28:13 +0000 (22:28 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 29 Apr 2013 05:28:13 +0000 (22:28 -0700)
* PHP-5.4:
  Revert "Add CURL_WRAPPERS_ENABLE constant"

Conflicts:
ext/curl/interface.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.