]> granicus.if.org Git - php/commit
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)
commitc38b73a701bf48321a586ef5a4e49ee4e368d486
tree1a52aafdfba052fdc5207b6a7ccd84099ff931ae
parente93f8e74d43d524a482ce43e5a62ca1980fe56c7
parent6f3bcb0d6edb49fa53b8171c0e75daca2f1dc038
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
ext/date/lib/parse_iso_intervals.re