projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d1a2c15 d6eb3b4)
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Fri, 12 Dec 2014 14:07:33 +0000 (15:07 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 12 Dec 2014 15:11:26 +0000 (16:11 +0100)
commitd5dd29ce5c28ee2d04107304bb084c4b79158da7
tree34789fefc89c7f58b194e56e0c859614f5039c52tree | snapshot
parentd1a2c1522188481d9b54120e3f17dd9243c11d90commit | diff
parentd6eb3b49c878ce01f1d9d73eebc4d9fec4330573commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS
  Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)

Conflicts:
Zend/zend_compile.c
Zend/zend_compile.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.