Merge branch 'dev' into FSM

# Conflicts:
#	depends/packages/zeromq.mk
#	src/assetchains.json
This commit is contained in:
jl777
2019-02-27 04:31:00 -11:00
parent 1da0a1710d
commit 53e66f1170
11 changed files with 96 additions and 11 deletions

View File

@@ -72,8 +72,12 @@ cd komodo
```
#### OSX
Ensure you have [brew](https://brew.sh) and the command line tools installed (comes automatically with XCode) and run:
Ensure you have [brew](https://brew.sh) and Command Line Tools installed.
```shell
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
# installs brew
xcode-select --install
# opens a pop-up window to install CLT without installing the entire Xcode package
brew update && brew install gcc@6
git clone https://github.com/komodoplatform/komodo --branch master --single-branch
cd komodo