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

]> icculus.org git repositories - mikachu/openbox.git/commit

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3263845 c49c2a8)

author	Dana Jansens <danakj@orodu.net>
	Thu, 21 Feb 2008 18:24:19 +0000 (13:24 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Thu, 21 Feb 2008 18:24:19 +0000 (13:24 -0500)
commit	198d98986bdf224ed29361541d19841339953088
tree	e0a588f29ce1f1c3102da4daf05316a15e9a6cea	tree
parent	3263845459d15da683b7cab92fb856acbdf2800e	commit \| diff
parent	c49c2a8e408f7482f2b977d6cf97517684476ed7	commit \| diff

Merge branch 'backport' into work

Conflicts:

openbox/openbox.c
openbox/session.c

openbox/actions.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/execute.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/moveresizeto.c	diff1 \|	diff2 \|	blob \| history
openbox/config.c	diff1 \|	diff2 \|	blob \| history
openbox/menu.c	diff1 \|	diff2 \|	blob \| history
openbox/mouse.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/session.c	diff1 \|	diff2 \|	blob \| history
openbox/translate.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager