]> git.sur5r.net Git - i3/i3/commit
Merge branch 'next'
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 30 Mar 2010 11:06:41 +0000 (13:06 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 30 Mar 2010 11:06:41 +0000 (13:06 +0200)
commit96128c9cfbda0029775cabaa22b82b97a0a1f2f3
treeaf9cf7e0f6636fa339de4bb742af161d5b206b8c
parent525913a9724aaa61d3ac6ab762c1615486f42587
parent86e196c57bf6780292a6143a9d294785194fe93a
Merge branch 'next'
include/client.h
include/data.h
src/resize.c
src/workspace.c