summaryrefslogtreecommitdiff
path: root/ext/simplexml
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-05-31 19:32:21 +0200
committerAnatol Belski <ab@php.net>2015-05-31 19:32:21 +0200
commit021effbe977083bfce7387aed8e006f2eeb8e50a (patch)
tree082209116fad8ebb0ca946eea57df1ccfbdb6e26 /ext/simplexml
parent60c925fd41d954a23ca9b9387f02add2e77b37ec (diff)
parent1e9522021ab147d7986fbd93dcd3eafae2b24620 (diff)
downloadphp-git-021effbe977083bfce7387aed8e006f2eeb8e50a.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: backport the basic code to properly recognize win 8.1 and 10 backport the manifest changes for makefile backport the manifest changes in js add default manifest add test
Diffstat (limited to 'ext/simplexml')
0 files changed, 0 insertions, 0 deletions