]> git.sur5r.net Git - i3/i3/commit
Merge branch 'role-criterion' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 15:10:05 +0000 (16:10 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 15:10:05 +0000 (16:10 +0100)
commit14dd8302703fd652cc61a9d0cc2962d5ea2e178d
tree78db2a98e0d0d2e9f16f8f603bd3410c6b74dd36
parentc88425147eb701114d9171ff0fcb6f161b9da9c1
parent9a76887a28b0ee009d658e442f351791480e8d0b
Merge branch 'role-criterion' into next