]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Mar 2015 14:57:41 +0000 (15:57 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Mar 2015 14:57:41 +0000 (15:57 +0100)
commit0148dc6fd30a41b7005ccdf6cda921b34c1ac592
tree0f6178ff4927d83f31791a1933f88ac74d1f60f2
parent6226400dfd19fb67f165ae543d1ceaa2d33008cc
parent5fb99ad9f70ec7bd19576a682a6bed8239a90312
Merge branch 'master' into next

Conflicts:
src/commands.c