Merge branch 'PHP-5.4' into PHP-5.5

Browse Source

* PHP-5.4:
  Revert "Add CURL_WRAPPERS_ENABLE constant"

Conflicts:
	ext/curl/interface.c

...

This commit is contained in:

Stanislav Malyshev

2013-04-28 22:28:13 -07:00

parent 86685aefab 4e773c1b92

commit 8a51bdd3ce

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available