Merge branch 'backport' into work

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 02ae6a304642ef4ce7a735ca0a55c827393f6e34..410eb6e0aaa139bd66967afb6ffae8414a75dafa 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -322,4 +322,3 @@ void keyboard_shutdown(gboolean reconfig)
     popup_free(popup);
     popup = NULL;
 }
-