Merge branch 'cpp-11' into crashlog_improvements

# Conflicts: # Makefile.src.in # src/crashlog.cpp # src/crashlog.h
2018-04-27 00:33:44 +01:00
parent 4a6ddb2d50 b90c5b9618
commit f42cc19aad
253 changed files with 9829 additions and 2475 deletions
--- a/src/crashlog.h
+++ b/src/crashlog.h
@@ -103,6 +103,7 @@ protected:
 	char *LogConfiguration(char *buffer, const char *last) const;
 	char *LogLibraries(char *buffer, const char *last) const;
 	char *LogGamelog(char *buffer, const char *last) const;
+	char *LogRecentNews(char *buffer, const char *list) const;
 	char *LogCommandLog(char *buffer, const char *last) const;

 public: