]> git.sur5r.net Git - i3/i3/commitdiff
Merge pull request #2113 from Airblader/bug-2111
authorMichael Stapelberg <stapelberg@users.noreply.github.com>
Fri, 25 Dec 2015 16:14:29 +0000 (17:14 +0100)
committerMichael Stapelberg <stapelberg@users.noreply.github.com>
Fri, 25 Dec 2015 16:14:29 +0000 (17:14 +0100)
Match on all criteria even if con_id or con_mark are given.

1  2 
src/match.c

diff --cc src/match.c
Simple merge