Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-06-25 21:44:20 +02:00
commit 7afb33d8f8
1 changed files with 1 additions and 1 deletions

View File

@ -405,7 +405,7 @@ int main(int argc, char *argv[]) {
/* If the user passes more arguments, we act like i3-msg would: Just send /* If the user passes more arguments, we act like i3-msg would: Just send
* the arguments as an IPC message to i3. This allows for nice semantic * the arguments as an IPC message to i3. This allows for nice semantic
* commands such as 'i3 border none'. */ * commands such as 'i3 border none'. */
if (optind < argc) { if (!only_check_config && optind < argc) {
/* We enable verbose mode so that the user knows whats going on. /* We enable verbose mode so that the user knows whats going on.
* This should make it easier to find mistakes when the user passes * This should make it easier to find mistakes when the user passes
* arguments by mistake. */ * arguments by mistake. */