Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-07 20:45:20 +02:00
commit e304902874
1 changed files with 1 additions and 1 deletions

View File

@ -781,7 +781,7 @@ Con *con_descend_tiling_focused(Con *con) {
* *
*/ */
Con *con_descend_direction(Con *con, direction_t direction) { Con *con_descend_direction(Con *con, direction_t direction) {
Con *most; Con *most = NULL;
DLOG("con_descend_direction(%p, %d)\n", con, direction); DLOG("con_descend_direction(%p, %d)\n", con, direction);
if (direction == D_LEFT || direction == D_RIGHT) { if (direction == D_LEFT || direction == D_RIGHT) {
if (con->orientation == HORIZ) { if (con->orientation == HORIZ) {