Merge branch 'release/2.1.1' into develop

nicolailang · Oct 4, 2014 · f9cdb6a · f9cdb6a
2 parents b9aa5ac + d0935e4
commit f9cdb6a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.dotphiles b/.dotphiles
@@ -1 +1 @@
-2.1.0
+2.1.1
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,7 @@
 dotphiles changelog
 -------------------
 
+  - 2.1.1  : Updated to 2.1.1
   - 2.1.0  : Updated to 2.1.0
   - 2.0.0  : Updated to 2.0.0
   - 1.1.0  : Use Base16 color scheme

diff --git a/vim/dotvim b/vim/dotvim
diff --git a/zsh/dotzsh b/zsh/dotzsh
diff --git a/zsh/zshenv b/zsh/zshenv
@@ -7,6 +7,9 @@
 #   Ben O'Hara <[email protected]>
 #
 
+# Dont read global configs
+unsetopt GLOBAL_RCS
+
 # Set the path to dotzsh.
 export DOTZSH="$HOME/.zsh"
+1 −1		.dotvim
+1 −1		CHANGES.md
+0 −11		ftplugin/yaml.vim
+3 −3		templates/vimrc
+1 −0		vundles.vim