git.openbox.org Git - mikachu/openbox.git/commit

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7dedc40 fba55d8)

author	Dana Jansens <danakj@orodu.net>
	Sat, 4 Aug 2007 18:45:03 +0000 (14:45 -0400)
committer	Dana Jansens <danakj@orodu.net>
	Sat, 4 Aug 2007 18:45:03 +0000 (14:45 -0400)
commit	1f5026f3974b64cda81773c3574ba788fd12ec80
tree	5424bd3994ce36047ee4e7d73763ef33daebdead	tree \| snapshot
parent	7dedc402b9c8e6740c7a278ee769a0204b8b168e	commit \| diff
parent	fba55d8d9f49f0714054bf84a604e70ac15ead3c	commit \| diff

Merge branch 'backport' into 3.4-working

Makefile.am	diff1 \|	diff2 \|	blob \| history
data/rc.xml	diff1 \|	diff2 \|	blob \| history
data/rc.xsd	diff1 \|	diff2 \|	blob \| history
openbox/actions/desktop.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/growtoedge.c	diff1 \|	diff2 \|	blob \| history
openbox/config.c	diff1 \|	diff2 \|	blob \| history
openbox/frame.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager