Merge branches 'wip/edges', 'mikabox/crap', 'mikabox/lock', 'mikabox/maybe' and ...
authorMikael Magnusson <mikachu@gmail.com>
Thu, 6 Nov 2014 03:50:55 +0000 (04:50 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Thu, 6 Nov 2014 03:50:55 +0000 (04:50 +0100)
commitb40a509eb9e837995adfaf70998354eb59093880
tree07c5a33b670382c612ee5a48c894d9800f044433
parentae5023326e35d033f9273ba9c056c161028237e6
parentdf5a57d68043ccf280539cd4016d4c58c21221df
parent7d3ed12861b04afd2b063f1a8d9ce99fe91bf97a
parent55e52ce1b26d3a5e736bee6095ac4c403cca15e9
parent579686212b2169a1f4dac1339bc85695f5761021
Merge branches 'wip/edges', 'mikabox/crap', 'mikabox/lock', 'mikabox/maybe' and 'mikabox/personal' into wip/mikabox

Conflicts:
obt/prop.c
openbox/client_list_combined_menu.c
openbox/event.c
14 files changed:
Makefile.am
obrender/font.c
obt/prop.c
obt/prop.h
openbox/client.c
openbox/client_list_combined_menu.c
openbox/client_list_menu.c
openbox/client_menu.c
openbox/config.c
openbox/event.c
openbox/menuframe.c
openbox/mouse.c
openbox/openbox.c
openbox/screen.c