Mcat12 590f1f97f7 Merge remote-tracking branch 'origin/development' into new/API ...

# Conflicts:
#	FTL.h
#	socket.c

2018-01-21 09:48:41 -05:00

..

libs

Properly track the git modules instead of ignoring

2018-01-10 22:00:26 -05:00

run.sh

Remove HTTP API specific code so it can be replaced with a new protocol

2018-01-03 20:16:50 -05:00

test_suite.sh

Merge remote-tracking branch 'origin/development' into new/API

2018-01-21 09:48:41 -05:00