Merge branch 'backport' into work

Conflicts:

	openbox/client.c
	openbox/event.c
	openbox/mouse.c
	openbox/openbox.c
	openbox/prop.c
	openbox/prop.h
	openbox/screen.c
	parser/parse.c
	parser/parse.h

1 files changed, 1 insertions, 0 deletions

diff --git a/obt/prop.h b/obt/prop.h
index 4de3111d..e1236116 100644
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -205,6 +205,7 @@ typedef enum {
     OBT_PROP_OB_WM_STATE_UNDECORATED,
     OBT_PROP_OPENBOX_PID, /* this is depreecated in favour of ob_control */
     OBT_PROP_OB_THEME,
+    OBT_PROP_OB_CONFIG_FILE,
     OBT_PROP_OB_CONTROL,
 
     OBT_PROP_NUM_ATOMS