Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Fri, 29 Feb 2008 03:21:02 +0000 (04:21 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Fri, 29 Feb 2008 03:21:02 +0000 (04:21 +0100)
commit173b9b764887929b7ff5d30b3e33f0602b0afda6
tree8681b38cf6e1e4ac7ca4c7d535042263064490d8
parent9d1bb266ee9e9be374944730f6e737f40393cd04
parent835b2de913cddcf545246d88a8a4e5d7d0028f8a
Merge branch 'backport' into work

Conflicts:

openbox/client.c
openbox/screen.c
openbox/client.c
openbox/client_menu.c
openbox/focus_cycle.c
openbox/frame.c
openbox/openbox.c
openbox/screen.c