Merge branch 'master' of https://github.com/rheit/zdoom into zscript

# Conflicts:
#	src/scripting/codegeneration/codegen.cpp
This commit is contained in:
Christoph Oelckers 2016-10-18 00:55:56 +02:00
commit 646f9b21c7
12 changed files with 64 additions and 59 deletions

View file

@ -497,7 +497,7 @@ DFsSection *FParser::looping_section()
if(!best || (current->start_index > best->start_index))
best = current; // save it
}
current = current->next;
current = current->next;
}
}