christos 87edd195b7 resolve conflicts		2019-12-15 16:16:34 +00:00
..
bin
dist	resolve conflicts	2019-12-15 16:16:34 +00:00
etc
include	resolve conflicts	2019-12-15 16:16:34 +00:00
lib
sbin
Makefile
Makefile.inc
TODO