icculus.org git repositories - dana/openbox.git/commit

]> icculus.org git repositories - dana/openbox.git/commit - parser/parse.c

author	Mikael Magnusson <mikachu@gmail.com>
	Sun, 26 Oct 2008 23:58:56 +0000 (00:58 +0100)
committer	Mikael Magnusson <mikachu@gmail.com>
	Sun, 26 Oct 2008 23:58:56 +0000 (00:58 +0100)
commit	e6fea245756b59f83dc0f51d13feee9cf093a1a1
tree	cefbc79a17772ac53d3df991d4c6a1c6a6319aaf	tree
parent	7b57ef12963a298c731d0ef4a67de9c985ac9ba4	commit \| diff
parent	c564b6245fcfaf0efd523cfa17bc1a73fe640d68	commit \| diff

Merge branch 'backport' into work

Conflicts:
openbox/client.c
openbox/prop.c
openbox/prop.h

Openbox Window Manager