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

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3f72b9d ba1ac21)

author	Mikael Magnusson <mikachu@gmail.com>
	Sun, 5 Jul 2009 20:27:25 +0000 (22:27 +0200)
committer	Mikael Magnusson <mikachu@gmail.com>
	Sat, 19 Sep 2009 13:03:12 +0000 (15:03 +0200)
commit	308478e4a5f4dc76d69395dda8a9bc42cb69eec4
tree	54ec31d91428b2a7d3e4c7bdf902fe182abfc25d	tree \| snapshot
parent	3f72b9d67f21781e513a9c058e8624b8b86b92ea	commit \| diff
parent	ba1ac214dfdbc0539c922e84c2318c1bf2566c0c	commit \| diff

Merge branch 'backport' into work

Conflicts:
openbox/actions/desktop.c
openbox/client.c
openbox/event.c
openbox/extensions.c
openbox/popup.c
openbox/screen.c
parser/parse.c

12 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
obt/paths.c	diff1 \|	\|	blob \| history
openbox/actions/desktop.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/moveresizeto.c	diff1 \|	diff2 \|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/frame.c	diff1 \|	diff2 \|	blob \| history
openbox/menu.c	diff1 \|	diff2 \|	blob \| history
openbox/popup.c	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	diff1 \|	diff2 \|	blob \| history
openbox/startupnotify.c	diff1 \|	diff2 \|	blob \| history
render/theme.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager