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

PH111P · Jun 1, 2018 · a8d8e9d · a8d8e9d
2 parents 3d0162f + 35183ab
commit a8d8e9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # This snippet has been shmelessly stol^Hborrowed from thestinger's repose Makefile
-VERSION = 1.1
+VERSION = 1.3
 GIT_DESC=$(shell test -d .git && git describe --always 2>/dev/null)
 
 ifneq "$(GIT_DESC)" ""

diff --git a/README.pod b/README.pod
@@ -78,7 +78,7 @@ Set the underline color of the bar. Accepts the same color formats as B<-B>.
 
 =head1 FORMATTING
 
-lemonbar provides a screenrc-inspired formatting syntax to allow full customization at runtime. Every formatting block is opened with C<%{> and closed by C<}> and accepts the following commands, the parser tries it's best to handle malformed input. Use C<%%> to get a literal percent sign (C<%>).
+lemonbar provides a screenrc-inspired formatting syntax to allow full customization at runtime. Every formatting block is opened with C<%{> and closed by C<}> and accepts the following commands, the parser tries its best to handle malformed input. Use C<%%> to get a literal percent sign (C<%>).
 
 =over
 
@@ -199,7 +199,7 @@ L<git repository|https://github.com/LemonBoy/bar>
 
 =head1 AUTHOR
 
-2012-2015 (C) The Lemon Man
+2012-2017 (C) The Lemon Man
 
 Xinerama support was kindly contributed by Stebalien