Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/mr-kelly/KSFramework
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhaoqingqing
zhaoqingqing committed Oct 17, 2016
2 parents 1f05655 + 8d25ff4 commit aaaa18d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion KEngine
Submodule KEngine updated 11 files
+0 −0 KEngine.UnityProject/Assets/KEngine.Lib/IModuleInitable.cs
+0 −0 KEngine.UnityProject/Assets/KEngine.Lib/IModuleInitable.cs.meta
+2 −0 KEngine.UnityProject/Assets/KEngine.Tools/GameSettings/KGameSettings.cs
+3 −1 KEngine.UnityProject/Assets/KEngine.Tools/KSettingManager.cs
+0 −1 KEngine.UnityProject/Assets/KEngine/CoreModules/ResourceModule/KAssetFileLoader.cs
+14 −9 KEngine.UnityProject/Assets/KEngine/CoreModules/ResourceModule/KResourceModule.cs
+6 −9 Solution/vs2012/KEngine.Editor.csproj
+6 −0 Solution/vs2012/KEngine.Lib.csproj
+6 −3 Solution/vs2012/KEngine.csproj
+ − Tools/UnityEngine.dll
+6 −0 Tools/premake_script.lua

0 comments on commit aaaa18d

Please sign in to comment.