diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-03-08 17:43:32 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-03-08 17:43:32 +0100 |
| commit | ec328fc04fe6e8d8c3d1ee386d4964963eb2ee17 (patch) | |
| tree | c91070084eee7915dd29453076dc7f30b5b97fa0 /openbox/config.h | |
| parent | cfe36a0df2db3e5fd4c52e32093ea095492297cf (diff) | |
| parent | c716d1788bb4f4b9db403617023f06347ba48102 (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/config.h')
| -rw-r--r-- | openbox/config.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/openbox/config.h b/openbox/config.h index 8a01ee1f..cc5fa89a 100644 --- a/openbox/config.h +++ b/openbox/config.h @@ -197,5 +197,4 @@ ObAppSettings* config_create_app_settings(void); void config_app_settings_copy_non_defaults(const ObAppSettings *src, ObAppSettings *dest); - #endif |