com php-src: Merged PHP-7.0 by hand due to conflicts.: ext/date/lib/LICENSE.rst ext/date/lib/astro.c ext/date/lib/dow.c ext/date/lib/fallbackmap.h
ext/date/lib/interval.c ext/date/lib /parse_date.c ext/date/lib/parse_date.c.orig ext/ date/lib/parse_date.re ext/date/lib/parse_iso_interva ls.c
ext/date/lib/parse_iso_intervals.re ext/date/l ib/parse_tz.c ext/date/lib/timelib.c ext/date/lib/tim elib.h ext/date/lib/timelib.m4
ext/date/lib/timelib _private.h
| From: | Derick Rethans | Date: | Tue, 15 Aug 2017 14:06:18 +0000 |
| Subject: | com php-src: Merged PHP-7.0 by hand due to conflicts.: ext/date/lib/LICENSE.rst ext/date/lib/astro.c ext/date/lib/dow.c ext/date/lib/fallbackmap.h ext/date/lib/interval.c ext/date/lib /parse_date.c ext/date/lib/parse_date.c.orig ext/ date/lib/parse_date.re ext/date/lib/parse_iso_interva ls.c ext/date/lib/parse_iso_intervals.re ext/date/l ib/parse_tz.c ext/date/lib/timelib.c ext/date/lib/tim elib.h ext/date/lib/timelib.m4 ext/date/lib/timelib _private.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99036@lists.php.net to get a copy of this message | ||
Commit: 584db6f38fcac3e5e1ca4c770d3aacfff09ee371
Author: Derick Rethans <github@derickrethans.nl> Tue, 15 Aug 2017 15:06:18 +0100
Parents: 3bc12268041bdeec9941c99f08b71620f7572eb0
Branches: PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=584db6f38fcac3e5e1ca4c770d3aacfff09ee371
Log:
Merged PHP-7.0 by hand due to conflicts.
Changed paths:
M ext/date/lib/LICENSE.rst
M ext/date/lib/astro.c
M ext/date/lib/dow.c
M ext/date/lib/fallbackmap.h
M ext/date/lib/interval.c
M ext/date/lib/parse_date.c
A ext/date/lib/parse_date.c.orig
M ext/date/lib/parse_date.re
M ext/date/lib/parse_iso_intervals.c
M ext/date/lib/parse_iso_intervals.re
M ext/date/lib/parse_tz.c
M ext/date/lib/timelib.c
M ext/date/lib/timelib.h
M ext/date/lib/timelib.m4
A ext/date/lib/timelib_private.h
D ext/date/lib/timelib_structs.h
M ext/date/lib/timezonemap.h
M ext/date/lib/tm2unixtime.c
M ext/date/lib/unixtime2tm.c
M ext/date/php_date.c
M ext/date/tests/DateTimeZone_getLocation.phpt
M ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
M ext/date/tests/bug35499.phpt
M ext/date/tests/bug41964..phpt
M ext/date/tests/bug45081.phpt
M ext/date/tests/bug68078_negative.phpt
M ext/date/tests/date_parse_001.phpt
M ext/date/tests/date_sun_info_001.phpt
M ext/date/tests/date_sun_info_002.phpt
M ext/date/tests/date_sun_info_003.phpt
M ext/date/tests/date_sun_info_variation1.phpt
M ext/date/tests/date_sun_info_variation2.phpt
M ext/date/tests/date_sun_info_variation3.phpt
M ext/date/tests/date_sunrise_variation1.phpt
M ext/date/tests/date_sunrise_variation3.phpt
M ext/date/tests/date_sunrise_variation4.phpt
M ext/date/tests/date_sunrise_variation5.phpt
M ext/date/tests/date_sunrise_variation6.phpt
M ext/date/tests/date_sunrise_variation7.phpt
M ext/date/tests/date_sunset_variation1.phpt
M ext/date/tests/date_sunset_variation3.phpt
M ext/date/tests/date_sunset_variation4.phpt
M ext/date/tests/date_sunset_variation5.phpt
M ext/date/tests/date_sunset_variation6.phpt
M ext/date/tests/date_sunset_variation7.phpt
M ext/date/tests/sunfuncts.phpt
M ext/date/tests/timezone_abbreviations_list_basic1.phpt
M ext/date/tests/timezone_name_from_abbr_basic1.phpt
M ext/intl/common/common_date.cpp
M ext/intl/timezone/timezone_class.cpp
Diff: <Diff exceeded maximum size>