git.lizzy.rs Git - bspwm.git/commit

]> git.lizzy.rs Git - bspwm.git/commit

author	Bastien Dejean <nihilhill@gmail.com>
	Mon, 6 May 2013 09:36:12 +0000 (11:36 +0200)
committer	Bastien Dejean <nihilhill@gmail.com>
	Mon, 6 May 2013 09:36:12 +0000 (11:36 +0200)
commit	06065f0cf5af147eefa5e6cba33aeee234d8d15e
tree	0de146b4fa1c99f756491d81edf2e6b681973525	tree \| snapshot
parent	944cbbd3e3fbaeec7e4ba4307089cb0d94c6ccd5	commit \| diff
parent	8e57511b50fc558ae5265d785285baae9a9922ec	commit \| diff

Merge branch 'master' into history

Conflicts:
messages.c
tree.c

A tiling window manager based on binary space partitioning