summaryrefslogtreecommitdiff
path: root/tests/basic/007.phpt
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-08-04 16:06:24 -0700
committerStanislav Malyshev <stas@php.net>2013-08-04 16:06:24 -0700
commitc793a6569013f9ab46f2cd7331cc1a04aa42cbed (patch)
treeba42379833bfa8176f468bfb23d24cd8ec3019e1 /tests/basic/007.phpt
parent3626db6142eda230586357a707b6cb4a0887e971 (diff)
parent8d86597d7368460383a33a4399ea7a8b244cd6fa (diff)
downloadphp-git-c793a6569013f9ab46f2cd7331cc1a04aa42cbed.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c
Diffstat (limited to 'tests/basic/007.phpt')
0 files changed, 0 insertions, 0 deletions