Merge branch 'master' into dritter/flexible_colors

This commit is contained in:
Dominik Ritter
2015-06-04 00:48:26 +02:00
+1
View File
@@ -130,6 +130,7 @@ fi
## Debugging
#zstyle ':vcs_info:*+*:*' debug true
#set -o xtrace
################################################################
# Prompt Segment Constructors