diff options
author | Ferenc Kovacs <tyrael@php.net> | 2015-02-10 10:36:25 +0100 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2015-02-10 10:36:25 +0100 |
commit | ac54df17df8aad2b71941def3a4552705682796f (patch) | |
tree | 6d193d3dbb41f6c145f19f0bae26f42fb62be5c3 /ext/dom/php_dom.c | |
parent | fb2314798e28b4970cb35497ebc615dffc48d930 (diff) | |
parent | a8d001aedfa06aa024e6488233dd46af7db7bb19 (diff) | |
download | php-git-ac54df17df8aad2b71941def3a4552705682796f.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add make install
Conflicts:
travis/compile.sh
Diffstat (limited to 'ext/dom/php_dom.c')
0 files changed, 0 insertions, 0 deletions