]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e34529 f1d0e50)
Merge branch 'PHP-5.6'
authorLior Kaplan <kaplanlior@gmail.com>
Sun, 17 Aug 2014 18:37:22 +0000 (21:37 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Sun, 17 Aug 2014 18:37:22 +0000 (21:37 +0300)
commit741605da73d424a3cb2fe29d2d5a610b010d0aff
treeefcbc0651b3ac19de488217b7fc5b756880bb71ftree | snapshot
parent1e3452992fac7536d30a92955b20b8af038f1ef7commit | diff
parentf1d0e50ea8915a18ab5bf24402b787c35552e162commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Correct typo in comments: 'initialized'

Conflicts:
ext/dom/php_dom.c
ext/spl/php_spl.c
ext/mbstring/mb_gpc.c diff1 | diff2 | blob | history
ext/spl/php_spl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.