christos 46a8957adc add a clear that did not merge.		2015-01-02 23:38:45 +00:00
..
bin	eliminate use of bsd.sys.mk from Makefiles	2014-01-16 01:15:32 +00:00
dist	add a clear that did not merge.	2015-01-02 23:38:45 +00:00
include	merge conflicts	2015-01-02 21:15:32 +00:00
lib	merge conflicts	2015-01-02 21:15:32 +00:00
file2netbsd
Makefile
Makefile.inc	Make a gcc 4.8 warning non-fatal (couldn't find a way to avoid it, the	2014-01-17 20:24:20 +00:00