]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 31 Aug 2011 12:45:14 +0000 (14:45 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 31 Aug 2011 12:45:14 +0000 (14:45 +0200)
commitb4809e9ba727c6113f325b49e378b2a3560ccfed
treee85f40f1c2c20ae4f47c2be4b080bc08b50a87a1
parentc3d0957efd46eaf86e711215f1ca8743157ab2da
parenta65b5fd9103225adcb08256461fdb819c3f96443
Merge branch 'master' into next
src/cfgparse.y
src/ipc.c