]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3af83e1 37d5a2b)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 20 Oct 2014 13:54:33 +0000 (15:54 +0200)
committerAnatol Belski <ab@php.net>
Mon, 20 Oct 2014 13:54:33 +0000 (15:54 +0200)
* PHP-5.5:
  initialize lineno before calling compile file file in phar
  News entry for new curl constants

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

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