summaryrefslogtreecommitdiff
path: root/Zend/tests
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-10-15 14:10:38 +0200
committerFerenc Kovacs <tyrael@php.net>2014-10-15 14:10:38 +0200
commitc32614370f1c819e5f2bb632912b4fcc6092cbfb (patch)
treead52723275fb58862d5faffacdd25875039eef90 /Zend/tests
parent52b93004d070ff59a1ed6dcd91c8b08935fc1c04 (diff)
parent646b4cca854b0b5fefedbcffa9e6f7ea8149b087 (diff)
downloadphp-git-c32614370f1c819e5f2bb632912b4fcc6092cbfb.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: PHP-5.6.3 is next update NEWS, 5.6.2 will be a security-only release Conflicts: configure.in main/php_version.h
Diffstat (limited to 'Zend/tests')
0 files changed, 0 insertions, 0 deletions