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

1  2 
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
ext/date/lib/parse_iso_intervals.re

Simple merge
Simple merge
Simple merge