]> git.sur5r.net Git - i3/i3/commit - include/all.h
Merge branch 'get-socketpath' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 2 Oct 2011 15:13:23 +0000 (16:13 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 2 Oct 2011 15:13:23 +0000 (16:13 +0100)
commit1f7cb178f9ad07e41c9fe29278497f2f84a53692
treed1bb2e3053e9a6e5ba47e3268fa4cf27eac0b3ad
parent3537f2d4ca6ef2447a92f222d3458d4e27899661
parent23796ea90075855ef6522e4fee8bc3e6777514c2
Merge branch 'get-socketpath' into next