Merge branch 'master' into next

2011-08-17 12:14:17 +02:00
parent 2abe23d6ff 336ce56cf3
commit 7a22bd1cf3
6 changed files with 41 additions and 5 deletions
--- a/include/x.h
+++ b/include/x.h
@ -104,4 +104,11 @@ void x_set_name(Con *con, const char *name);
 */
 void x_set_i3_atoms();

+/**
+ * Set warp_to coordinates.  This will trigger on the next call to
+ * x_push_changes().
+ *
+ */
+void x_set_warp_to(Rect *rect);
+
 #endif