Merge branch 'master' of https://github.com/hyzboy/CMPlatform into HEAD

# Conflicts: # src/Win/Time.cpp
2021-05-13 17:12:03 +08:00
parent 04ab8d3635 83fbda2860
commit e2f056ddff
1 changed files with 0 additions and 1 deletions
--- a/src/Win/Time.cpp
+++ b/src/Win/Time.cpp
@@ -1,5 +1,4 @@
 #include<hgl/platform/Platform.h>
-#include<hgl/TypeFunc.h>
 #include<hgl/math/TimeConst.h>

 namespace hgl