Merge branch 'master' of https://github.com/urbit/urbit into test

Conflicts:
	urb/urbit.pill
This commit is contained in:
ault011 2014-09-12 11:40:22 -07:00 committed by ault011
commit c20a95c201

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