Dominik Ritter 4c2f58bdbd Merge remote-tracking branch 'VanRoy/master' into staging_065 ... Conflicts were: - functions/icons.zsh: The Java Segment was added on master, but on next were added various Segments with icons in the meantime. - powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox Segment was added on next.		2018-06-07 00:11:15 +02:00
..
colors.zsh	Make variables local	2018-03-27 01:33:21 +02:00
icons.zsh	Merge remote-tracking branch 'VanRoy/master' into staging_065	2018-06-07 00:11:15 +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