]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@gmail.com>
Wed, 4 Apr 2012 08:37:29 +0000 (16:37 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 4 Apr 2012 08:37:29 +0000 (16:37 +0800)
commit9882358984709539a3aa5228ef95843da52c7d7b
tree979f34929f45fe4bb52c526b4fd3eea22115bfaf
parentefd671f242e87e3301a1b3e76179955f26119feb
parentf7bf83546e1f2edb71ad05bd33e01894a359fe02
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix warning "suggest parentheses around assignment"

Conflicts:
main/SAPI.c