Merge branch 'master' into bar-bindsym

This commit is contained in:
Ian Fan 2018-10-10 12:23:04 +00:00 committed by GitHub
commit cd6917d4a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 63 additions and 37 deletions

View file

@ -62,7 +62,7 @@ int main(int argc, char **argv) {
bar_id = strdup(optarg);
break;
case 'v':
fprintf(stdout, "sway version " SWAY_VERSION "\n");
fprintf(stdout, "swaybar version " SWAY_VERSION "\n");
exit(EXIT_SUCCESS);
break;
case 'd': // Debug