Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-10-02 12:57:27 +01:00
commit 3537f2d4ca

View File

@ -785,7 +785,7 @@ id::
Compares the X11 window ID, which you can get via +xwininfo+ for example. Compares the X11 window ID, which you can get via +xwininfo+ for example.
title:: title::
Compares the X11 window title (_NET_WM_NAME or WM_NAME as fallback). Compares the X11 window title (_NET_WM_NAME or WM_NAME as fallback).
mark:: con_mark::
Compares the mark set for this container, see <<vim_like_marks>>. Compares the mark set for this container, see <<vim_like_marks>>.
con_id:: con_id::
Compares the i3-internal container ID, which you can get via the IPC Compares the i3-internal container ID, which you can get via the IPC