]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Jan 2012 11:50:22 +0000 (11:50 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Jan 2012 11:50:22 +0000 (11:50 +0000)
commit8d72a77c7a56fa788d29a54455c806f18e2a3fd5
tree0fe246dfaa3628714c00e162f7d68d8f3f5cba1a
parentfa83b46dfa8c77130ed1225ac70aa6482967ea61
parent9798e5cae613bfb62bbcef2a89409f3f0db517f3
Merge branch 'master' into next

Conflicts:
src/handlers.c
src/handlers.c