Merge branch 'tracerestrict-sx' into jgrpp

# Conflicts: # src/lang/english.txt # src/saveload/extended_ver_sl.cpp # src/tracerestrict.cpp # src/tracerestrict.h # src/tracerestrict_gui.cpp
2016-06-30 20:25:22 +01:00
parent 929327ecaf 71aa4c75cb
commit 80e3af6bf5
14 changed files with 345 additions and 19 deletions
--- a/source.list
+++ b/source.list
@@ -418,6 +418,7 @@ widget_type.h
 os/windows/win32.h
 music/win32_m.h
 sound/win32_s.h
+unit_conversion.h
 video/win32_v.h
 window_func.h
 window_gui.h