christos 3cae15996b Reduce diffs with upstream and enable the built-in database code.		2019-03-11 17:59:28 +00:00
..
bin	Reduce diffs with upstream and enable the built-in database code.	2019-03-11 17:59:28 +00:00
dist	Reduce diffs with upstream and enable the built-in database code.	2019-03-11 17:59:28 +00:00
include	resolve conflicts	2019-03-11 00:15:38 +00:00
lib	resolve conflicts	2019-03-11 00:15:38 +00:00
man	merge conflicts	2016-07-15 19:40:42 +00:00
Makefile	…
Makefile.inc	resolve conflicts	2019-03-11 00:15:38 +00:00
prepare-import.sh	merge conflicts.	2015-12-17 22:31:01 +00:00