Merge branch 'wip/edges' into wip/mikabox

diff --cc Makefile.am
Simple merge

diff --cc openbox/event.c
Simple merge

diff --cc openbox/frame.c
Simple merge

diff --cc openbox/openbox.c
Simple merge

diff --cc openbox/window.c
index 51806f9c325f346c2dbbf40730b50245054bdc77,3ca2d237a89414d6ad67c78f5ae6c13ef165c28f..3d231439262bd9d510e0d5df6118c9655b7c5d58
--- 1/openbox/window.c
--- 2/openbox/window.c
+++ b/openbox/window.c
@@@ -24,9 -24,9 +24,10 @@@
  #include "frame.h"
  #include "openbox.h"
  #include "prompt.h"
+ #include "edges.h"
  #include "debug.h"
  #include "grab.h"
 +#include "obt/prop.h"
  #include "obt/xqueue.h"
  
  static GHashTable *window_map;