]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9a5db2 3b82c4e)
Merge branch 'PHP-5.6'
authorMichael Wallner <mike@php.net>
Thu, 21 Aug 2014 20:46:03 +0000 (22:46 +0200)
committerMichael Wallner <mike@php.net>
Thu, 21 Aug 2014 20:46:03 +0000 (22:46 +0200)
* PHP-5.6:
  fix bug #67865
  updated NEWS to fit last release
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages

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

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