]> git.sur5r.net Git - i3/i3/commit - src/con.c
Merge pull request #3170 from stapelberg/master-merge
authorIngo Bürk <admin@airblader.de>
Sat, 10 Mar 2018 20:37:53 +0000 (21:37 +0100)
committerGitHub <noreply@github.com>
Sat, 10 Mar 2018 20:37:53 +0000 (21:37 +0100)
commit74c0e1b8664b11e5b1afb34501c03bcec43bfa2a
tree48ddee9ba3f2e2db299949163119bbdbeb260059
parentde0ff844e073cb49c2ba78482ae3398c76a90db0
parentffcf2bca85707e82ac1def6afb3a4e015dc98dfd
Merge pull request #3170 from stapelberg/master-merge

Fix incorrect merge *sigh*