diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-04 16:06:24 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-04 16:06:24 -0700 |
| commit | c793a6569013f9ab46f2cd7331cc1a04aa42cbed (patch) | |
| tree | ba42379833bfa8176f468bfb23d24cd8ec3019e1 /scripts | |
| parent | 3626db6142eda230586357a707b6cb4a0887e971 (diff) | |
| parent | 8d86597d7368460383a33a4399ea7a8b244cd6fa (diff) | |
| download | php-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 'scripts')
| -rw-r--r-- | scripts/dev/generate-phpt.phar | bin | 52355 -> 52356 bytes | |||
| -rw-r--r-- | scripts/dev/generate-phpt/src/testcase/gtTestCase.php | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/scripts/dev/generate-phpt.phar b/scripts/dev/generate-phpt.phar Binary files differindex 0112d87a97..c6268c0af3 100644 --- a/scripts/dev/generate-phpt.phar +++ b/scripts/dev/generate-phpt.phar diff --git a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php index cc5e19a5ae..60c115a9c1 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php @@ -104,7 +104,7 @@ abstract class gtTestCase { /** - * Add contructor argument initialisation to test case + * Add constructor argument initialisation to test case * */ public function constructorArgInit() { |