]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06fdf35 4dc9945)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 23 Nov 2014 22:54:58 +0000 (14:54 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 23 Nov 2014 22:54:58 +0000 (14:54 -0800)
* PHP-5.6:
  typo fixes - https://github.com/vlajos/misspell_fixer

Conflicts:
ext/ftp/ftp.h
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/standard/image.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.