]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcb63a8 900751e)
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 20:51:06 +0000 (22:51 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 20:51:06 +0000 (22:51 +0200)
* PHP-5.4:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.
  Fix NEWS, the previous wrong was introduced in commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
  update NEWS


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