]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f399a7 caacaee)
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Mon, 23 Feb 2015 10:23:57 +0000 (11:23 +0100)
committerJulien Pauli <jpauli@php.net>
Mon, 23 Feb 2015 10:23:57 +0000 (11:23 +0100)
* PHP-5.6:
  Updated NEWS
  updated NEWS
  curl: add new proxy constants

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.