1
0

Merge remote-tracking branch 'origin/master' into foldermove2

Conflicts:
	GNUmakefile
This commit is contained in:
Alexander Harkness
2013-11-24 14:37:03 +00:00
131 changed files with 6157 additions and 3632 deletions

View File

@@ -124,7 +124,7 @@ void cLog::Log(const char * a_Format, va_list argList)
#endif
if (m_File)
{
fprintf(m_File, "%s\n", Line.c_str(), m_File);
fprintf(m_File, "%s\n", Line.c_str());
fflush(m_File);
}