From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 13 Jan 2014 22:36:47 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.8~145
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=10d7c1a993433ba7149704933f6d8b62cd4401f7;p=i3%2Fi3

Merge branch 'master' into next
---

10d7c1a993433ba7149704933f6d8b62cd4401f7
diff --cc include/ipc.h
index 24014c2f,dfb12b9b..cbbec8e4
--- a/include/ipc.h
+++ b/include/ipc.h
@@@ -80,3 -81,12 +80,10 @@@ void ipc_send_event(const char *event, 
  void ipc_shutdown(void);
  
  void dump_node(yajl_gen gen, Con *con, bool inplace_restart);
+ 
+ /**
+  * For the workspace "focus" event we send, along the usual "change" field,
+  * also the current and previous workspace, in "current" and "old"
+  * respectively.
+  */
+ void ipc_send_workspace_focus_event(Con *current, Con *old);
 -
 -#endif