]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1984a49 86b2d7b)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 27 Aug 2014 01:54:06 +0000 (03:54 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 27 Aug 2014 01:54:06 +0000 (03:54 +0200)
* PHP-5.6:
  remove the -dev suffix from the Zend version

Conflicts:
Zend/zend.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.