]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efd671f f7bf835)
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)
* PHP-5.3:
  Fix warning "suggest parentheses around assignment"

Conflicts:
main/SAPI.c


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