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.c b/obt/prop.c
index 6eedce5d..89d3950d 100644
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -183,6 +183,7 @@ void obt_prop_startup()
 
     CREATE_(OPENBOX_PID);
     CREATE_(OB_THEME);
+    CREATE_(OB_CONFIG_FILE);
     CREATE_(OB_WM_ACTION_UNDECORATE);
     CREATE_(OB_WM_STATE_UNDECORATED);
     CREATE_(OB_CONTROL);