]> git.sur5r.net Git - i3/i3/commit - include/i3/ipc.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 31 Jan 2015 21:42:54 +0000 (22:42 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 31 Jan 2015 21:42:54 +0000 (22:42 +0100)
commitdd5be77d1dcc7e7eb40ce1c33f985816fc0b8f79
tree6ad5e7ec69c53e5649282566ef7f566018533ff2
parent74b69d6d02391d9e8beb2c8585bad2c552c731f4
parenta1aa8786266a791c9dd69437f1e848d6c0956950
Merge branch 'master' into next
src/load_layout.c
testcases/t/234-layout-restore-output.t