From: Mikael Magnusson <mikachu@gmail.com>
Date: Thu, 18 Apr 2013 10:37:45 +0000 (+0200)
Subject: Merge branch 'wip/edges' into wip/mikabox
X-Git-Tag: mikabox-3.5-7~34
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=22786961997c5b1777abbb2d70bf80f856b66a55;p=mikachu%2Fopenbox.git

Merge branch 'wip/edges' into wip/mikabox
---

22786961997c5b1777abbb2d70bf80f856b66a55
diff --cc openbox/window.c
index 51806f9c,3ca2d237..3d231439
--- a/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;