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

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 95887df 444be0c)

author	Mikael Magnusson <mikachu@gmail.com>
	Sun, 13 Jul 2008 16:10:52 +0000 (18:10 +0200)
committer	Mikael Magnusson <mikachu@gmail.com>
	Sun, 13 Jul 2008 16:20:02 +0000 (18:20 +0200)
commit	91f7f3963e64373c7007725e43b9666b8988a31e
tree	fe835b04a79cc96bfacb76e5250459465a462320	tree \| snapshot
parent	95887df4af3382303e4ab1b1b78c7b68bcd48a74	commit \| diff
parent	444be0c54c00535ea08d8f7d47fa0cf0aa421867	commit \| diff

Merge branch 'buttons' into wip/mikabox

Conflicts:
openbox/client_menu.c
openbox/framerender.c
render/render.c
render/render.h
render/theme.c
render/theme.h

Makefile.am	diff1 \|	diff2 \|	blob \| history
openbox/client_menu.c	diff1 \|	diff2 \|	blob \| history
openbox/framerender.c	diff1 \|	diff2 \|	blob \| history
openbox/prompt.c	diff1 \|	\|	blob \| history
render/render.c	diff1 \|	diff2 \|	blob \| history
render/render.h	diff1 \|	diff2 \|	blob \| history
render/theme.c	diff1 \|	diff2 \|	blob \| history
render/theme.h	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager