diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-14 18:39:14 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-14 18:39:14 +0000 |
| commit | b9ad0002f5fc40f5808f85119a67012c2e9a4141 (patch) | |
| tree | 5dc09ca330b2358670215ff9cdbf6f3bfdcbd6e4 /sapi/phpdbg/phpdbg.c | |
| parent | 0bfa245aa3f3994d3095afd696bbd3f0130594ab (diff) | |
| parent | 855d2966385755435b65d77e1c0dfda17555eab9 (diff) | |
| download | php-git-b9ad0002f5fc40f5808f85119a67012c2e9a4141.tar.gz | |
Merge branch 'master' into jsond
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index ec65a22f12..c624669785 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1571,7 +1571,7 @@ phpdbg_out: #ifdef _WIN32 } __except(phpdbg_exception_handler_win32(xp = GetExceptionInformation())) { - phpdbg_error("segfault", "", "Access violation (Segementation fault) encountered\ntrying to abort cleanly..."); + phpdbg_error("segfault", "", "Access violation (Segmentation fault) encountered\ntrying to abort cleanly..."); } phpdbg_out: #endif |