]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0245755 2c23004)
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 22 Jul 2013 04:17:59 +0000 (21:17 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 22 Jul 2013 04:17:59 +0000 (21:17 -0700)
commit1a05648e6ddb6af847a34e7adf4bbea45409809c
treeff7d2056f2100b26d5ab39f1fd12223823bad3e9tree | snapshot
parent02457554a35fbb96fd3f51caf7deab91ca32ecb2commit | diff
parent2c23004a1e3eb14695e6c44e52e4d5fe2a2d37d9commit | diff
Merge branch 'PHP-5.5'

* PHP-5.5:
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix

Conflicts:
configure.in
main/php_version.h
php.ini-development diff1 | diff2 | blob | history
php.ini-production diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.