Merge branch 'backport' into work

Conflicts:

	openbox/menuframe.c
	openbox/prompt.c
	openbox/prop.c
	openbox/prop.h

1 files changed, 1 insertions, 0 deletions

diff --git a/obt/prop.h b/obt/prop.h
index 97a2c9f5..22a1ab42 100644
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -51,6 +51,7 @@ typedef enum {
     OBT_PROP_WM_CLIENT_MACHINE,
     OBT_PROP_WM_COMMAND,
     OBT_PROP_WM_CLIENT_LEADER,
+    OBT_PROP_WM_TRANSIENT_FOR,
     OBT_PROP_MOTIF_WM_HINTS,
 
     /* SM atoms */