diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-08 14:19:04 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-08 14:19:04 -0500 |
| commit | 2f09e0ce388f63c341cb328d795766e2bd0dc24b (patch) | |
| tree | 14fb36919947e80ba0dfc151d0f1f02ed46fd712 /openbox/actions/all.c | |
| parent | 84843c3f9842046e34366202f1a8f80ce8565f91 (diff) | |
| parent | 672aea85cfe2ac2bc8cb4e3f34fd023f10d90182 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/actions/all.h
openbox/actions/session.c
openbox/client.c
openbox/event.c
openbox/grab.c
Diffstat (limited to 'openbox/actions/all.c')
| -rw-r--r-- | openbox/actions/all.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/openbox/actions/all.c b/openbox/actions/all.c index 952d756d..4563e65f 100644 --- a/openbox/actions/all.c +++ b/openbox/actions/all.c @@ -9,7 +9,6 @@ void action_all_startup(void) action_reconfigure_startup(); action_exit_startup(); action_restart_startup(); - action_session_startup(); action_cyclewindows_startup(); action_breakchroot_startup(); action_close_startup(); |