]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 20 Jan 2012 18:10:52 +0000 (18:10 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 20 Jan 2012 18:10:52 +0000 (18:10 +0000)
commit759ed0b6e3983bec11fab20c3174c95aac5c7a4d
treefc4cd6f77b01b208c99141b9286abc27938b3d85
parenta2823d3aebead090be91fe2b91c046caac4cd9fa
parent113a96dd0d87f5998325f86076ca4207277a8769
Merge branch 'master' into next
src/main.c