Dominik Ritter e763fa14b0 Merge remote-tracking branch 'chhschou/master' into staging_065 ...

Conflicts were:
- powerlevel9k.zsh-theme and test/segments/rust_version.spec:
rust_version Segment changed (#641) on master and colors got
names (#703) on next.

2018-06-07 00:44:47 +02:00

..

colors.zsh

Make variables local

2018-03-27 01:33:21 +02:00

icons.zsh

Merge remote-tracking branch 'chhschou/master' into staging_065

2018-06-07 00:44:47 +02:00

utilities.zsh

Merge pull request #791 from dritter/local_variables

2018-04-13 21:58:10 -04:00

vcs.zsh

Merge remote-tracking branch 'floor114/next' into staging_065

2018-06-06 23:52:15 +02:00