Christoph M. Becker 293dd3d701 Merge branch 'PHP-5.6' into PHP-7.0 ... # Resolved conflicts: # ext/calendar/calendar.c		2016-07-29 01:26:15 +02:00
..
tests	Merge branch 'PHP-5.6' into PHP-7.0	2016-07-29 01:26:15 +02:00
cal_unix.c	Merge branch 'PHP-5.6' into PHP-7.0	2016-01-01 19:48:25 +02:00
calendar.c	Merge branch 'PHP-5.6' into PHP-7.0	2016-07-29 01:26:15 +02:00
config.m4
config.w32
CREDITS
dow.c	master renames phase 1	2014-08-25 19:24:55 +02:00
easter.c	Merge branch 'PHP-5.6' into PHP-7.0	2016-01-01 19:48:25 +02:00
french.c	master renames phase 1	2014-08-25 19:24:55 +02:00
gregor.c	master renames phase 1	2014-08-25 19:24:55 +02:00
jewish.c	Drop VC6 support in ext/calendar	2015-03-29 06:35:23 +02:00
julian.c	typo fixes - https://github.com/vlajos/misspell_fixer	2014-11-23 14:52:47 -08:00
package.xml
php_calendar.h	cleaning up the version macros	2015-03-23 20:13:59 +01:00
sdncal.h	master renames phase 1	2014-08-25 19:24:55 +02:00