6 Commits

Author	SHA1	Message	Date
Vicent Marti	e1807113c4	merge: Warning noise	2013-05-01 15:31:23 +02:00
Edward Thomson	75d1c8c664	move NAME and REUC extensions to sys/	2013-04-30 17:33:11 -05:00
Edward Thomson	0462fba538	renames!	2013-04-30 16:01:11 -05:00
Edward Thomson	bec65a5e99	merge!	2013-04-30 15:31:31 -05:00
Vicent Marti	a7ffd936bf	clar: fix merge/setup.c	2013-01-04 17:47:52 +01:00
Edward Thomson	5a62d659bc	MERGE_HEAD contents iterator	2013-01-04 17:47:51 +01:00