]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 20 Aug 2011 15:48:49 +0000 (17:48 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 20 Aug 2011 15:48:49 +0000 (17:48 +0200)
commit2cd8231fce33bd312ec818724d9225ff8b20255a
treeebf0ca8ed4bf73b5b51e1486428a28173c754e9a
parent22e30061f366400727bd746636be990db7cad89b
parente0d7ce1232eec7f534f0e447722da600c977a565
Merge branch 'master' into next
src/main.c