Merge branch 'tracerestrict' into tracerestrict-sx

2016-06-30 20:15:27 +01:00
parent fe1fee456a f942de699c
commit e4b932d53a
13 changed files with 360 additions and 18 deletions
--- a/source.list
+++ b/source.list
@@ -393,6 +393,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