Merge remote-tracking branch 'upstream/master' into registered-user-only-server

This commit is contained in:
woogerboy21 2014-07-19 23:38:50 -04:00
commit 92ae596d11

View file

@ -2,7 +2,7 @@
if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
brew update
brew install qt cmake protobuf libgcrypt
brew install qt protobuf libgcrypt
else
sudo apt-get update -qq
sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev