summaryrefslogtreecommitdiff
path: root/openbox/actions.c
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2008-03-08 17:43:32 +0100
committerMikael Magnusson <mikachu@comhem.se>2008-03-08 17:43:32 +0100
commitec328fc04fe6e8d8c3d1ee386d4964963eb2ee17 (patch)
treec91070084eee7915dd29453076dc7f30b5b97fa0 /openbox/actions.c
parentcfe36a0df2db3e5fd4c52e32093ea095492297cf (diff)
parentc716d1788bb4f4b9db403617023f06347ba48102 (diff)
Merge branch 'backport' into work
Conflicts: obt/keyboard.c openbox/actions/cyclewindows.c openbox/actions/directionalwindows.c openbox/frame.c openbox/openbox.c
Diffstat (limited to 'openbox/actions.c')
-rw-r--r--openbox/actions.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/openbox/actions.c b/openbox/actions.c
index 8f72714e..1ec53287 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -58,7 +58,6 @@ struct _ObActionsAct {
static GSList *registered = NULL;
-
void actions_startup(gboolean reconfig)
{
if (reconfig) return;