icculus.org git repositories - mikachu/openbox.git/commit

]> icculus.org git repositories - mikachu/openbox.git/commit

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b40a509 0239b5b)

author	Mikael Magnusson <mikachu@gmail.com>
	Thu, 6 Nov 2014 03:51:26 +0000 (04:51 +0100)
committer	Mikael Magnusson <mikachu@gmail.com>
	Thu, 6 Nov 2014 03:51:26 +0000 (04:51 +0100)
commit	e72aa3e6865776c131eab2e77c8c4d7269bbdef2
tree	fd1a2e01b8d439d3f4f8777161cdca7f7a4051b6	tree
parent	b40a509eb9e837995adfaf70998354eb59093880	commit \| diff
parent	0239b5b61a9afddb60a6bd81f638ddbaf90eaec3	commit \| diff

Merge branch 'work' into wip/mikabox

Conflicts:
openbox/config.c

16 files changed:

obrender/font.c	diff1 \|	diff2 \|	blob \| history
obrender/render.h	diff1 \|	diff2 \|	blob \| history
obrender/theme.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/desktop.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/resize.c	diff1 \|	diff2 \|	blob \| history
openbox/client_menu.c	diff1 \|	diff2 \|	blob \| history
openbox/config.c	diff1 \|	diff2 \|	blob \| history
openbox/config.h	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/frame.c	diff1 \|	diff2 \|	blob \| history
openbox/frame.h	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/mouse.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager