Merge branch 'master' into next

[i3/i3] / include / atoms.xmacro

diff --git a/include/atoms.xmacro b/include/atoms.xmacro
index 309a3325f8bd3dcc972f0ab21770a32871e7380e..af60b9660453d3eb93c58e66f31d691702420c09 100644 (file)
--- a/include/atoms.xmacro
+++ b/include/atoms.xmacro
@@ -15,6 +15,7 @@ xmacro(_NET_CLIENT_LIST_STACKING)
 xmacro(_NET_CURRENT_DESKTOP)
 xmacro(_NET_ACTIVE_WINDOW)
 xmacro(_NET_WORKAREA)
+xmacro(_NET_STARTUP_ID)
 xmacro(WM_PROTOCOLS)
 xmacro(WM_DELETE_WINDOW)
 xmacro(UTF8_STRING)
@@ -25,3 +26,5 @@ xmacro(WM_WINDOW_ROLE)
 xmacro(I3_SOCKET_PATH)
 xmacro(I3_CONFIG_PATH)
 xmacro(I3_SYNC)
+xmacro(I3_SHMLOG_PATH)
+xmacro(I3_PID)