Merge branch 'master' into test

Conflicts:
	urb/urbit.pill
This commit is contained in:
Ubuntu 2014-09-10 18:46:31 +00:00
commit 2289431b70

View File

@ -31,7 +31,7 @@ Urbit depends on:
####Ubuntu or Debian
sudo apt-get install libgmp3-dev libsigsegv-dev openssl libssl-dev libncurses5-dev git make exuberant-ctags automake autoconf libtool
sudo apt-get install libgmp3-dev libsigsegv-dev openssl libssl-dev libncurses5-dev git make exuberant-ctags automake autoconf libtool g++
####Fedora