Merge remote-tracking branch 'upstream/master' into xft-port

* upstream/master:
  Update the usage text
  Minor change to -f handling
  travis: Run a apt-get update before installing the needed packages
  Use the maximum width reported by the font if the attributes table isn't found
This commit is contained in:
krypt-n
2015-06-02 08:44:28 +02:00
3 changed files with 37 additions and 68 deletions

View File

@@ -34,7 +34,8 @@ Force docking without asking the window manager. This is needed if the window ma
=item B<-f> I<font>
Comma separated list of fonts, lemonbar supports a maximum of five fonts (the limit can be tweaked by changing the MAX_FONT_COUNT parameter in the source).
Define the font to load into one of the five slots (the number of slots is hardcoded and can be tweaked by
changing the MAX_FONT_COUNT parameter in the source code).
=item B<-p>