]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Mon, 1 Sep 2014 22:54:52 +0000 (06:54 +0800)
committerTjerk Meesters <datibbaw@php.net>
Mon, 1 Sep 2014 22:54:52 +0000 (06:54 +0800)
commit297a9b1f759dd6b027ee48869175eee470d830e9
tree947e0a019dbf839c85e84b46422f28bd6014f294
parentd5b0606a6246eee293e7ac937fcb5fdc231f61dd
parentf54451cf399ebba0e52b42ab45de52f0f4bc3afb
Merge branch 'PHP-5.6'

* PHP-5.6:
  Make DOMNode::textContent writeable
  Updated UPGRADING
  Updated NEWS

Conflicts:
ext/dom/attr.c
ext/dom/characterdata.c
ext/dom/document.c
ext/dom/node.c
ext/dom/node.c