christos 68dbbb44ff merge conflicts

2016-05-01 23:32:00 +00:00

..

bin

merge conflicts

2016-05-01 23:32:00 +00:00

dist

merge conflicts

2016-05-01 23:32:00 +00:00

html

…

include

merge conflicts

2016-05-01 23:32:00 +00:00

lib

merge conflicts

2016-05-01 23:32:00 +00:00

scripts

merge conflicts

2016-05-01 23:32:00 +00:00

importdate

merge conflicts

2016-05-01 23:32:00 +00:00

Makefile

…

Makefile.inc

…

ntp2netbsd

…