Merge branch 'master' into next
This commit is contained in:
commit
41ac26456b
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue