dim 5340ca17ab After some horrible wrestling with Subversion's worthless merge ...

implementation, merge ^/head r275078 through r275117.

Note that all the extraneous mergeinfo is there because Subversion
created it.  I'll hopefully be able to remove it again when merging back
to head.

2014-11-26 14:36:04 +00:00

..

lib

After some horrible wrestling with Subversion's worthless merge

2014-11-26 14:36:04 +00:00

libexec

After some horrible wrestling with Subversion's worthless merge

2014-11-26 14:36:04 +00:00

tests

Add placeholder Kyuafiles for various top-level hierarchies.

2014-04-21 21:39:25 +00:00

usr.bin

After some horrible wrestling with Subversion's worthless merge

2014-11-26 14:36:04 +00:00

usr.sbin

After some horrible wrestling with Subversion's worthless merge

2014-11-26 14:36:04 +00:00

Makefile

Use src.opts.mk in preference to bsd.own.mk except where we need stuff

2014-05-06 04:22:01 +00:00

Makefile.inc

Use src.opts.mk in preference to bsd.own.mk except where we need stuff

2014-05-06 04:22:01 +00:00