]> git.sur5r.net Git - i3/i3/commit
Merge branch 'fix-scratchpad-reconf'
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 25 Jan 2013 14:48:38 +0000 (15:48 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 25 Jan 2013 14:48:38 +0000 (15:48 +0100)
commitd426f1570bd99315486c0b0634e04393aa65e6ed
treea79e983bd86199a22d2cdca4a97531cfb34b4aff
parent8f4456a14a0eb2b6750c3cad643baab018136395
parent7be5ece6636f7a4c800ab0c5dd6289b38db7b435
Merge branch 'fix-scratchpad-reconf'