nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-26 03:24:14 +02:00
parent a57a2b9ccb ed6f5d214c
commit 53a9ace3a6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/con.h
View File

@ -72,7 +72,7 @@ Con *con_inside_floating(Con *con);
* Checks if the given container is inside a focused container.
*
*/
Con *con_inside_focused(Con *con);
bool con_inside_focused(Con *con);
/**
* Returns the container with the given client window ID or NULL if no such

2
src/con.c
View File

@ -362,7 +362,7 @@ Con *con_inside_floating(Con *con) {
* Checks if the given container is inside a focused container.
*
*/
Con *con_inside_focused(Con *con) {
bool con_inside_focused(Con *con) {
if (con == focused)
return true;
if (!con->parent)