Merge branch 'master' into next

2011-09-17 14:13:05 +01:00
parent 5a85c9efd2 18129cf0b0
commit 7a38d8ac56
5 changed files with 50 additions and 16 deletions
--- a/include/xcb.h
+++ b/include/xcb.h
@ -108,7 +108,7 @@ void xcb_draw_rect(xcb_connection_t *conn, xcb_drawable_t drawable,
 * The truth is, however, that we will manage them.
 *
 */
-void fake_configure_notify(xcb_connection_t *conn, Rect r, xcb_window_t window);
+void fake_configure_notify(xcb_connection_t *conn, Rect r, xcb_window_t window, int border_width);

 /**
 * Generates a configure_notify_event with absolute coordinates (relative to