Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-09-26 20:12:07 +01:00
commit db33da2258

View File

@ -284,7 +284,7 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
ystr("focus");
y(array_open);
TAILQ_FOREACH(node, &(con->focus_head), nodes) {
TAILQ_FOREACH(node, &(con->focus_head), focused) {
y(integer, (long int)node);
}
y(array_close);