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

author	Dana Jansens <danakj@orodu.net>
	Sun, 15 Jul 2007 16:56:13 +0000 (12:56 -0400)
committer	Dana Jansens <danakj@orodu.net>
	Sun, 15 Jul 2007 16:56:13 +0000 (12:56 -0400)
commit	88254b8eadb2e760e3df86813f93df834035bde8
tree	1e64184202709374e18221ab7845769fffc5cae7	tree
parent	80658c90ccb0e79b3d5068c32c1802b0b32a35b0	commit \| diff
parent	96951500f6d8ca58d2ab7706d5c6accb36677ae8	commit \| diff

Merge branch 'master' into 3.4

Conflicts:

openbox/actions/desktop.c