]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 150dc69 381fd62)
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Fri, 5 Dec 2014 21:58:48 +0000 (13:58 -0800)
committerAdam Harvey <aharvey@php.net>
Fri, 5 Dec 2014 21:58:48 +0000 (13:58 -0800)
* PHP-5.6:
  Revert unintentional docblock change

1  2 
ext/curl/interface.c patch | diff1 | diff2 | blob | history

diff --cc ext/curl/interface.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.