]> git.lizzy.rs Git - bspwm.git/commitdiff
projects / bspwm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89af854 9d9b45f)
Merge branch 'master' into status
authorBastien Dejean <nihilhill@gmail.com>
Mon, 17 Dec 2012 19:27:22 +0000 (20:27 +0100)
committerBastien Dejean <nihilhill@gmail.com>
Mon, 17 Dec 2012 19:27:22 +0000 (20:27 +0100)
1  2 
tree.c patch | diff1 | diff2 | blob | history

diff --cc tree.c
Simple merge
A tiling window manager based on binary space partitioning