Merge branch 'backport' into work

Conflicts:

	openbox/frame.c
	openbox/menuframe.c

1 files changed, 2 insertions, 0 deletions

diff --git a/obt/prop.h b/obt/prop.h
index e1236116..97a2c9f5 100644
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -84,6 +84,8 @@ typedef enum {
     OBT_PROP_NET_WM_BOTTOMRIGHT,
     OBT_PROP_NET_WM_BOTTOMLEFT,
 
+    OBT_PROP_NET_WM_WINDOW_TYPE_POPUP_MENU,
+
     OBT_PROP_PRIVATE_PADDING1,
     OBT_PROP_PRIVATE_PADDING2,
     OBT_PROP_PRIVATE_PADDING3,