Commit 54afa5ab authored by Greg Williams's avatar Greg Williams
Browse files

Merge branch 'master' of github.com:Seagate/kinetic-c 

Conflicts:
	Makefile
	src/lib/kinetic_logger.c
	vendor/kinetic-simulator/stopSimulator.sh
parents e56997e9 a19a2abf
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment