christos 717847f56d resolve conflicts		2016-06-03 20:39:02 +00:00
..
bin	merge conflicts	2016-05-01 23:32:00 +00:00
dist	resolve conflicts	2016-06-03 20:39:02 +00:00
html	Reorg docs, part 1:	2014-07-05 19:22:41 +00:00
include	resolve conflicts	2016-06-03 20:39:02 +00:00
lib	merge conflicts	2016-05-01 23:32:00 +00:00
scripts	resolve conflicts	2016-06-03 20:39:02 +00:00
Makefile	…
Makefile.inc	Putting () around conditionals avoids the error when the variables are	2014-12-23 19:11:14 +00:00
importdate	resolve conflicts	2016-06-03 20:39:02 +00:00
ntp2netbsd	merge conflicts	2015-04-07 17:34:18 +00:00