]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 25 Aug 2011 16:51:02 +0000 (18:51 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 25 Aug 2011 16:51:02 +0000 (18:51 +0200)
commitc7ac1f907747e97bc97fdb45d4cf909eebbccb90
tree7ce2555217359bd85cb04efefd0aafd508343efe
parente411223f8ba3b9b53b53e1a9ea4f772fa4f6fda1
parentb7a3d8505b3ad3ee2bf226faacc1309a5b0534b5
Merge branch 'master' into next
i3bar/src/child.c