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.
This commit is contained in:
Dominik Ritter 2018-06-07 00:11:15 +02:00
commit 4c2f58bdbd
3 changed files with 16 additions and 0 deletions

View file

@ -135,6 +135,8 @@ The segments that are currently available are:
* `rust_version` - Display the current rust version and [logo](https://www.rust-lang.org/logos/rust-logo-blk.svg).
* **Swift Segments:**
* `swift_version` - Show the version number of the installed Swift.
* **Java Segments:**
* `java_version` - Show the current Java version.
**Cloud Segments:**
* **AWS Segments:**