Merge branch 'master' of github.com:Rafiot/dotfiles

Conflicts: init_env_ubuntu.sh
Rafiot · Oct 16, 2014 · 55bc700 · 55bc700
2 parents 88dfc2d + 6e30c72
commit 55bc700
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/init_env_ubuntu.sh b/init_env_ubuntu.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-sudo apt-get install vim vim-scripts vim-nox pylint build-essential \
-                     exuberant-ctags tmux fonts-inconsolata htop \
+sudo apt-get install vim vim-scripts vim-nox pylint build-essential curl\
+                     exuberant-ctags tmux fonts-inconsolata htop python-pip \
                      python-virtualenv
 
 sudo pip install --upgrade flake8