]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorLior Kaplan <kaplanlior@gmail.com>
Mon, 16 Jun 2014 20:32:10 +0000 (23:32 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Mon, 16 Jun 2014 20:32:10 +0000 (23:32 +0300)
* PHP-5.5:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well

1  2 
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re

Simple merge
Simple merge