diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-09-02 06:54:52 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-09-02 06:54:52 +0800 |
| commit | 297a9b1f759dd6b027ee48869175eee470d830e9 (patch) | |
| tree | 947e0a019dbf839c85e84b46422f28bd6014f294 /ext/reflection/php_reflection.c | |
| parent | d5b0606a6246eee293e7ac937fcb5fdc231f61dd (diff) | |
| parent | f54451cf399ebba0e52b42ab45de52f0f4bc3afb (diff) | |
| download | php-git-297a9b1f759dd6b027ee48869175eee470d830e9.tar.gz | |
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
Diffstat (limited to 'ext/reflection/php_reflection.c')
0 files changed, 0 insertions, 0 deletions