]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorLior Kaplan <kaplanlior@gmail.com>
Wed, 1 Apr 2015 15:30:55 +0000 (18:30 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Wed, 1 Apr 2015 15:30:55 +0000 (18:30 +0300)
commit3b8b1435ad832e162a2a3a2009a548e833ebb99a
treecf0c471ebc65ad89bf14c7d643d3bc70b47a6d8b
parent780a8123fe11ef255b264b18b3482cc1a0810d61
parent3409d87eab47980246ddd9969cd2a61a2edacafb
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix typo: unitialized -> uninitialized
  Fix typo: unitialized -> uninitialized

Conflicts:
ext/xmlwriter/php_xmlwriter.c
ext/pcre/pcrelib/pcre_exec.c
ext/xmlwriter/php_xmlwriter.c