]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 24 Jan 2013 13:45:14 +0000 (14:45 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 24 Jan 2013 13:45:14 +0000 (14:45 +0100)
commita5c9b0dedbe13a0099ec7fa466a548cc987e6613
treed2ab2554e4029fdd1f09f65fbc7cc1272efb7a84
parent28933f8de30c39d1ac9223b5c34d6e6659194d57
parent70067c72d5cf7a443942dbac31efffde44e510cf
Merge branch 'master' into next
src/config.c