]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Mar 2015 14:40:59 +0000 (15:40 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Mar 2015 14:40:59 +0000 (15:40 +0100)
commit6226400dfd19fb67f165ae543d1ceaa2d33008cc
tree1c0df7147e9d47a8b2ba80fb441794213d75ec60
parenta2a32ab1ee04c0d29217b6e8b51897140e09239c
parent53b621f1aa4ff9f5d18ac5de7e78735bf158545b
Merge branch 'master' into next
src/restore_layout.c