]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 10 Jun 2013 20:36:41 +0000 (13:36 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 10 Jun 2013 20:36:41 +0000 (13:36 -0700)
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)

1  2 
README.PARAMETER_PARSING_API
Zend/zend_API.h
ext/intl/tests/badargs.phpt
ext/pdo/pdo_sql_parser.c
ext/sqlite3/libsqlite/sqlite3.c

Simple merge
diff --cc Zend/zend_API.h
Simple merge
Simple merge
Simple merge
Simple merge