Merge branch 'crashlog_improvements' into jgrpp

# Conflicts: # source.list # src/openttd.cpp # src/stdafx.h # src/vehicle.cpp
2016-02-17 22:56:15 +00:00
parent ead72b7753 ae6e43c5fa
commit 5dba89c783
15 changed files with 283 additions and 3 deletions
--- a/source.list
+++ b/source.list
@@ -1240,3 +1240,6 @@ tracerestrict.h
 tracerestrict.cpp
 tracerestrict_gui.cpp
 saveload/tracerestrict_sl.cpp
+
+scope_info.cpp
+scope_info.h