]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 14 Sep 2012 11:18:04 +0000 (13:18 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 14 Sep 2012 11:18:04 +0000 (13:18 +0200)
commit794783defbb7073f5ca4676e9b088308baac5540
tree169f7d583796dd917c2abbcb6e4c190af3a3c693
parent22922a9e7094fd029a5d356bd48237dae3b5a435
parent0929f68a100078965ae41f90f130cb209b3102cc
Merge branch 'master' into next
src/con.c
src/scratchpad.c