]> git.sur5r.net Git - i3/i3/commit - src/assignments.c
Merge branch 'get-marks' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 9 Aug 2011 07:28:06 +0000 (09:28 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 9 Aug 2011 07:28:06 +0000 (09:28 +0200)
commiteb0a56fad1a9048e3905972f5db0d61c5bd13516
tree645788c2e0e5cfb6e174cca430bd5c203970b371
parent4253aa4ba20a44520f0e08f9e1df4ee9502fa565
parentfadf9088db875f1c04de4dc00ec3448f7dc408e6
Merge branch 'get-marks' into next
src/ipc.c