modified:   Makefile
	modified:   src/log/logging.c
	modified:   src/log/logging.h
	modified:   src/main.c
	modified:   src/nettcp/bo_net.h
	modified:   src/tools/dbgout.c
	modified:   src/tools/dbgout.h
Merge branch 'ringlog' of https://github.com/0x42/fire into ringlog
Merge branch 'ringlog' of https://github.com/0x42/fire into ringlog

Conflicts:
	Makefile
	src/log/bologging.c
	src/log/bologging.h
	src/main.c
	src/tools/dbgout.h

	modified:   .gitignore
	modified:   Makefile
	renamed:    src/log/logging.c -> src/log/bologging.c
	new file:   src/log/bologging.h
	deleted:    src/log/logging.h
	modified:   src/log/robolog.h
	modified:   src/main.c
	new file:   src/nettcp/bo_fifo.c
	new file:   src/nettcp/bo_fifo.h
	modified:   src/nettcp/bo_net.c
	modified:   src/nettcp/bo_net.h
	new file:   src/nettcp/bo_net_fifo_server.c
	deleted:    src/oht/Makefile
	deleted:    src/oht/readme
	deleted:    src/oht/test/makefile
	deleted:    src/oht/test/unity/extras/fixture/src/unity_fixture.c
	deleted:    src/oht/test/unity/extras/fixture/src/unity_fixture.h
	deleted:    src/oht/test/unity/extras/fixture/src/unity_fixture_internals.h
	deleted:    src/oht/test/unity/extras/fixture/src/unity_fixture_malloc_overrides.h
	deleted:    src/oht/test/unity/src/unity.c
	deleted:    src/oht/test/unity/src/unity.h
	deleted:    src/oht/test/unity/src/unity_internals.h
	modified:   src/tools/dbgout.c
	modified:   src/tools/dbgout.h
	new file:   src/tools/ocfg.c
	new file:   src/tools/ocfg.h
	new file:   src/tools/ocrc.c
	new file:   src/tools/ocrc.h
	new file:   src/tools/ofnv1a.c
	new file:   src/tools/ofnv1a.h
	renamed:    src/oht/src/oht.c -> src/tools/oht.c
	renamed:    src/oht/src/oht.h -> src/tools/oht.h
	new file:   test/Makefile
	new file:   test/botest/Makefile
	new file:   test/botest/test_netfifo.out
	modified:   test/logtest.c
	modified:   test/maintest.c
	new file:   test/netfifo/test_runners/Test_fifo_Runners.c
	new file:   test/netfifo/test_runners/all_tests.c
	new file:   test/netfifo/testfifonet.c
	new file:   test/ocfg/Test_ocfg.c
	new file:   test/ocfg/test_runners/Test_ocfg_Runner.c
	new file:   test/ocfg/test_runners/all_tests.c
	new file:   test/ocrc/Test_ocrc.c
	new file:   test/ocrc/test_runners/Test_ocrc_Runner.c
	new file:   test/ocrc/test_runners/all_tests.c
	new file:   test/ofnv1a/Test_ofnv1a.c
	new file:   test/ofnv1a/test_runners/Test_ofnv1a_Runner.c
	new file:   test/ofnv1a/test_runners/all_tests.c
	renamed:    src/oht/test/test/Test_oht.c -> test/oht/Test_oht.c
	renamed:    src/oht/test/test/test_runners/Test_oht_Runner.c -> test/oht/test_runners/Test_oht_Runner.c
	renamed:    src/oht/test/test/test_runners/all_tests.c -> test/oht/test_runners/all_tests.c
	new file:   test/stress/clientTcp.c
	new file:   test/stress/tcpnet
	new file:   test/test.cfg
Merge branch 'ringlog' of https://github.com/0x42/fire into ringlog

Conflicts:
	Makefile
	src/main.c

	modified:   Makefile
	modified:   src/log/bologging.c
	modified:   src/log/robolog.c
	modified:   src/main.c
	modified:   src/nettcp/bo_fifo.c
	modified:   src/nettcp/bo_fifo.h
	modified:   src/nettcp/bo_net_fifo_server.c
	modified:   src/tools/dbgout.h
	modified:   test/botest/Makefile
	modified:   test/botest/test_netfifo.out
	modified:   test/netfifo/test_runners/Test_fifo_Runners.c
	modified:   test/netfifo/testfifonet.c
	modified:   test/stress/clientTcp.c
	modified:   test/stress/tcpnet
	modified:   Makefile
	modified:   src/log/bologging.c
	modified:   src/log/bologging.h
	modified:   src/tools/dbgout.c
	modified:   src/tools/dbgout.h
	modified:   Makefile
Merge branch 'ringlog' of https://github.com/0x42/fire into ringlog
	modified:   .gitignore
	modified:   Makefile
	modified:   src/nettcp/bo_fifo.h
	modified:   test/netfifo/test_runners/Test_fifo_Runners.c
	modified:   test/netfifo/testfifonet.c