diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-02-27 04:50:41 +0100 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-27 02:34:08 -0500 |
| commit | 22a88cfe99d897dc7d3be7b53b954f6cdfa250c6 (patch) | |
| tree | 1ef48238ea15993d800874bb99444c7de0364411 /openbox/frame.h | |
| parent | 7e47a57027e043d4fe908d5f0acb7882d4f9330f (diff) | |
| parent | 490ef3213a09ec2b202e9b511a92ce89f811af66 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/event.c
openbox/event.h
Diffstat (limited to 'openbox/frame.h')
| -rw-r--r-- | openbox/frame.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbox/frame.h b/openbox/frame.h index e1b787fe..fd5adf74 100644 --- a/openbox/frame.h +++ b/openbox/frame.h @@ -74,7 +74,7 @@ typedef enum { /*! Display a button to toggle the window's placement on all desktops */ OB_FRAME_DECOR_ALLDESKTOPS = 1 << 7, - OB_FRAME_DECOR_SHADE = 1 << 8, /*!< Displays a shade button */ + OB_FRAME_DECOR_SHADE = 1 << 8, /*!< Display a shade button */ OB_FRAME_DECOR_CLOSE = 1 << 9 /*!< Display a close button */ } ObFrameDecorations; |