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

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7cd370e 796e4c4)

author	Mikael Magnusson <mikachu@gmail.com>
	Wed, 17 Apr 2013 11:06:53 +0000 (13:06 +0200)
committer	Mikael Magnusson <mikachu@gmail.com>
	Wed, 17 Apr 2013 11:06:53 +0000 (13:06 +0200)
commit	b4a82c5a7c4502a8e345e73c76754e84356cd528
tree	3187e709feeb5bca7908f35454878fdbd681f215	tree \| snapshot
parent	7cd370e5be6dab01b32a5af6b779dcf7a836c250	commit \| diff
parent	796e4c4e45641d925a03b88f6dc6d5600f207da1	commit \| diff

Merge branch 'mikabox/maybe' into wip/mikabox

Conflicts:
openbox/client_list_combined_menu.c
openbox/config.c
openbox/event.c
openbox/moveresize.c

obrender/font.c	diff1 \|	diff2 \|	blob \| history
obrender/render.h	diff1 \|	diff2 \|	blob \| history
openbox/client_list_combined_menu.c	diff1 \|	diff2 \|	blob \| history
openbox/config.c	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/keyboard.c	diff1 \|	diff2 \|	blob \| history
openbox/menu.h	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.h	diff1 \|	diff2 \|	blob \| history
openbox/mouse.c	diff1 \|	diff2 \|	blob \| history
openbox/moveresize.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager