Merge remote-tracking branch 'origin/master' into everard

Conflicts:
	zshenv
This commit is contained in:
Thomas Ruoff
2014-11-07 11:39:35 +01:00
2 changed files with 9 additions and 1 deletions

2
vimrc
View File

@@ -41,7 +41,7 @@ Plugin 'vim-airline', {'name': 'airline'}
Plugin 'chriskempson/base16-vim'
Plugin 'scrooloose/syntastic.git'
Plugin 'Townk/vim-autoclose'
Plugin 'Raimondi/delimitMate'
Plugin 'pangloss/vim-javascript'
Plugin 'mustache/vim-mustache-handlebars'

8
zshenv
View File

@@ -20,6 +20,14 @@ BASE16_SCHEME="solarized"
BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh"
[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
DIST=$(lsb_release -si)
case $DIST in
Arch )
# use python 2.7 by default
export PYTHON=python2
;;
esac
# BW specific stuff
JIRA_URL="https://jira.brandwatch.com"