nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2013-03-17 01:01:11 +01:00
parent 1510579c86 1e388796ab
commit 41ac26456b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i3-dmenu-desktop
View File

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

6
src/main.c
View File

@ -4,7 +4,7 @@
* vim:ts=4:sw=4:expandtab * vim:ts=4:sw=4:expandtab
* *
* i3 - an improved dynamic tiling window manager * 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 * main.c: Initialization, main loop
* *
@ -315,11 +315,11 @@ int main(int argc, char *argv[]) {
only_check_config = true; only_check_config = true;
break; break;
case 'v': 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); exit(EXIT_SUCCESS);
break; break;
case 'm': 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(); display_running_version();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;