Merge branch 'work' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Thu, 6 Nov 2014 03:51:26 +0000 (04:51 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Thu, 6 Nov 2014 03:51:26 +0000 (04:51 +0100)
commite72aa3e6865776c131eab2e77c8c4d7269bbdef2
treefd1a2e01b8d439d3f4f8777161cdca7f7a4051b6
parentb40a509eb9e837995adfaf70998354eb59093880
parent0239b5b61a9afddb60a6bd81f638ddbaf90eaec3
Merge branch 'work' into wip/mikabox

Conflicts:
openbox/config.c
16 files changed:
obrender/font.c
obrender/render.h
obrender/theme.c
openbox/actions/desktop.c
openbox/actions/resize.c
openbox/client_menu.c
openbox/config.c
openbox/config.h
openbox/event.c
openbox/frame.c
openbox/frame.h
openbox/keyboard.c
openbox/menu.h
openbox/menuframe.c
openbox/mouse.c
openbox/openbox.c