diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-03-02 17:23:23 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-03-02 17:23:23 -0500 |
| commit | 7fb107cd37a09787c5cfa590688944b3bcb2bab8 (patch) | |
| tree | bdd5bbf3eb5d4594dc9ae5b90bf553f14ee0946d /openbox/misc.h | |
| parent | ac255432b46617fe01fd40fd02fdea878893ce3c (diff) | |
| parent | f542c5143ac115937c5ee8f3a229e557383cd180 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/actions/execute.c
openbox/event.c
openbox/openbox.c
openbox/openbox.h
Diffstat (limited to 'openbox/misc.h')
| -rw-r--r-- | openbox/misc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openbox/misc.h b/openbox/misc.h index 13530ed9..05b5ac85 100644 --- a/openbox/misc.h +++ b/openbox/misc.h @@ -60,7 +60,8 @@ typedef enum { OB_STATE_STARTING, OB_STATE_RUNNING, - OB_STATE_EXITING + OB_STATE_EXITING, + OB_STATE_RECONFIGURING } ObState; typedef enum |