Merge branch 'master' into next

2013-06-28 00:14:30 +02:00 · 2013-06-28 00:14:30 +02:00 · 8677936f6c
parent d83b1f7851 32e2180b56
commit 8677936f6c
1 changed files with 1 additions and 1 deletions
--- a/i3-nagbar/main.c
+++ b/i3-nagbar/main.c
@ -322,7 +322,7 @@ int main(int argc, char *argv[]) {
        {"font", required_argument, 0, 'f'},
        {"button", required_argument, 0, 'b'},
        {"help", no_argument, 0, 'h'},
-        {"message", no_argument, 0, 'm'},
+        {"message", required_argument, 0, 'm'},
        {"type", required_argument, 0, 't'},
        {0, 0, 0, 0}
    };