]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorLior Kaplan <kaplanlior@gmail.com>
Mon, 16 Jun 2014 20:36:39 +0000 (23:36 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Mon, 16 Jun 2014 20:36:39 +0000 (23:36 +0300)
commit6e0a9b4588f71ecb3b582c729d3b482f65e10ceb
tree5ec3ea70e82ef82c11dd44e5134f72d9e53ae7cf
parentb4d61c335be1b877277d305cd16c1923292c7e78
parentb538816b0bff9f974223be1b39e4cbdd9cda8adc
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well