Merge branch 'master' into next

diff --git a/i3-dmenu-desktop b/i3-dmenu-desktop
index e0a35b8dbb87c19d4d2f795ee80c3611241c139c..65e99ec09b13c663df6820dbcbf293c588bb463d 100755 (executable)
--- a/i3-dmenu-desktop
+++ b/i3-dmenu-desktop
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # vim:ts=4:sw=4:expandtab
 #
-# © 2012 Michael Stapelberg
+# © 2012-2013 Michael Stapelberg
 #
 # No dependencies except for perl ≥ v5.10
 
@@ -45,7 +45,7 @@ my $result = GetOptions(
     'dmenu=s' => \$dmenu_cmd,
     'entry-type=s' => \@entry_types,
     'version' => sub {
-        say "dmenu-desktop 1.4 © 2012 Michael Stapelberg";
+        say "dmenu-desktop 1.4 © 2012-2013 Michael Stapelberg";
         exit 0;
     },
     'help' => sub {

diff --git a/src/main.c b/src/main.c
index a49241dda9d4ec39737c397caeed73ac830e727b..db3aca49f4c0f7909200f7afa6d6eac6a462c665 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4,7 +4,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * main.c: Initialization, main loop
  *
@@ -315,11 +315,11 @@ int main(int argc, char *argv[]) {
                 only_check_config = true;
                 break;
             case 'v':
-                printf("i3 version " I3_VERSION " © 2009-2012 Michael Stapelberg and contributors\n");
+                printf("i3 version " I3_VERSION " © 2009-2013 Michael Stapelberg and contributors\n");
                 exit(EXIT_SUCCESS);
                 break;
             case 'm':
-                printf("Binary i3 version:  " I3_VERSION " © 2009-2012 Michael Stapelberg and contributors\n");
+                printf("Binary i3 version:  " I3_VERSION " © 2009-2013 Michael Stapelberg and contributors\n");
                 display_running_version();
                 exit(EXIT_SUCCESS);
                 break;