]> git.sur5r.net Git - i3/i3/commit - i3bar/src/main.c
Merge branch 'bar-config' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 22 Oct 2011 16:02:49 +0000 (17:02 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 22 Oct 2011 16:02:49 +0000 (17:02 +0100)
commitd75560981e966713bc9bee1d33032dcfa2ff906f
treed0ca8876665d60867ca08b0ed12ca4dd17165a4a
parent9d67ae2202840bdb52766701844b9d2dd23002f5
parent753d67fb64ebe43e7b113f04b1e1aee687f44043
Merge branch 'bar-config' into next