]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Jan 2012 15:08:36 +0000 (15:08 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 21 Jan 2012 15:08:36 +0000 (15:08 +0000)
commitfabcd7d911de216573848872f6c6574c6353b32b
tree4a2a7d38441f58e688df0a4571eae54783bab865
parent53f19576d6d573c0be3ac4f6aa8f291f931951a2
parentac84ed002bfa95eec1d7c63cf8ef9bfd9e9ae304
Merge branch 'master' into next
src/con.c
src/randr.c