Merge branch '0.3.1'

This commit is contained in:
Sascha Kruse 2012-08-02 17:13:57 +02:00
commit b7875450dd

View File

@ -1136,6 +1136,7 @@ void parse_cmdline(int argc, char *argv[])
{"geometry", required_argument, NULL, 'g'}, {"geometry", required_argument, NULL, 'g'},
{"config", required_argument, NULL, 'r'}, {"config", required_argument, NULL, 'r'},
{"mod", required_argument, NULL, 'M'}, {"mod", required_argument, NULL, 'M'},
{"mon", required_argument, NULL, 'm'},
{"ns", no_argument, NULL, 'x'}, {"ns", no_argument, NULL, 'x'},
{"follow", required_argument, NULL, 'o'}, {"follow", required_argument, NULL, 'o'},
{"version", no_argument, NULL, 'v'}, {"version", no_argument, NULL, 'v'},