Merge branch 'mikabox/actions' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Sat, 4 Oct 2008 22:04:58 +0000 (00:04 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Sat, 4 Oct 2008 22:04:58 +0000 (00:04 +0200)
commitd908603918630b0498c31921077ce8418a970ec7
treeb0e92b1dba2f40e85ba76e433c66836bbc6896f1
parent8a2805d456247ab75a83c8204a7d54e24c72569f
parent5440d091064f51e0ce2aa042c12c29259ef16b01
Merge branch 'mikabox/actions' into wip/mikabox

Conflicts:
openbox/actions/focus.c
openbox/event.c
openbox/actions/focus.c
openbox/event.c