Merge branch 'master' into dev

This commit is contained in:
Adam Ierymenko 2017-03-17 12:37:23 -07:00
commit df30255542

View file

@ -11,8 +11,8 @@ ifeq ($(OSTYPE),Linux)
endif endif
ifeq ($(OSTYPE),FreeBSD) ifeq ($(OSTYPE),FreeBSD)
CC=gcc CC=clang
CXX=g++ CXX=clang++
ZT_BUILD_PLATFORM=7 ZT_BUILD_PLATFORM=7
include make-bsd.mk include make-bsd.mk
endif endif