Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-11-29 21:24:05 +00:00
commit f2b73b64be
1 changed files with 3 additions and 1 deletions

View File

@ -103,7 +103,9 @@ static int detect_version(char *buf) {
strncasecmp(bind, "focus down", strlen("focus down")) == 0 || strncasecmp(bind, "focus down", strlen("focus down")) == 0 ||
strncasecmp(bind, "border normal", strlen("border normal")) == 0 || strncasecmp(bind, "border normal", strlen("border normal")) == 0 ||
strncasecmp(bind, "border 1pixel", strlen("border 1pixel")) == 0 || strncasecmp(bind, "border 1pixel", strlen("border 1pixel")) == 0 ||
strncasecmp(bind, "border borderless", strlen("border borderless")) == 0) { strncasecmp(bind, "border borderless", strlen("border borderless")) == 0 ||
strncasecmp(bind, "--no-startup-id", strlen("--no-startup-id")) == 0 ||
strncasecmp(bind, "bar", strlen("bar")) == 0) {
printf("deciding for version 4 due to this line: %.*s\n", (int)(walk-line), line); printf("deciding for version 4 due to this line: %.*s\n", (int)(walk-line), line);
return 4; return 4;
} }