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

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c4372f1 2abf952)

author	Mikael Magnusson <mikachu@gmail.com>
	Wed, 17 Apr 2013 10:55:53 +0000 (12:55 +0200)
committer	Mikael Magnusson <mikachu@gmail.com>
	Wed, 17 Apr 2013 10:55:53 +0000 (12:55 +0200)
commit	d23578286e21b8915893ff1f02ae7465b2bd3493
tree	59f92365115105714f5fdff201bd4de9e88e6d00	tree \| snapshot
parent	c4372f168192622971ef36ebd050fb020e3fee65	commit \| diff
parent	2abf9528ab7677d159f78dab9d6629e6e61e26e2	commit \| diff

Merge branch 'mikabox/personal' into wip/mikabox

Conflicts:
obt/prop.c
openbox/event.c
openbox/screen.c

obrender/theme.c	diff1 \|	diff2 \|	blob \| history
obt/prop.c	diff1 \|	diff2 \|	blob \| history
obt/prop.h	diff1 \|	diff2 \|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/client_list_combined_menu.c	diff1 \|	diff2 \|	blob \| history
openbox/client_list_menu.c	diff1 \|	diff2 \|	blob \| history
openbox/client_menu.c	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.c	diff1 \|	diff2 \|	blob \| history
openbox/mouse.c	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager