Merge branch 'ci-dev'

This commit is contained in:
Srivats P 2016-09-14 21:18:19 +05:30
commit 23ab64dc4e

View File

@ -14,7 +14,7 @@ matrix:
compiler: gcc compiler: gcc
before_install: before_install:
- "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf; fi" - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf260; fi"
addons: addons:
apt: apt: