Merge branch 'master' into next

2012-10-29 16:42:11 +01:00
parent 7c94e32819 eb8c21a5b8
commit 71ccb4bef2
2 changed files with 3 additions and 1 deletions
--- a/include/data.h
+++ b/include/data.h
@ -135,6 +135,7 @@ struct deco_render_params {
    Rect con_deco_rect;
    uint32_t background;
    bool con_is_leaf;
+    orientation_t parent_orientation;
 };

 /**