diff options
| author | BDKPlayer <fabian.stotz@yahoo.de> | 2020-04-10 17:56:15 +0200 |
|---|---|---|
| committer | BDKPlayer <fabian.stotz@yahoo.de> | 2020-04-10 17:56:15 +0200 |
| commit | d5cb8a2a4d69db11a305121e17f2d4e0ddcdbaf2 (patch) | |
| tree | a0da14e069b4bbeeacae4665fd3c0fed211898ee | |
| parent | 8fc311eaba0bc23a2b4cfbbd7882d2385710e234 (diff) | |
| parent | 48592baf82f27cd569305eca95a5e4b798b82cc7 (diff) | |
merged pausemanager remove
| -rw-r--r-- | AoE_imgui_DE.vcxproj.filters | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/AoE_imgui_DE.vcxproj.filters b/AoE_imgui_DE.vcxproj.filters index 01a3a28..3502a91 100644 --- a/AoE_imgui_DE.vcxproj.filters +++ b/AoE_imgui_DE.vcxproj.filters @@ -198,9 +198,12 @@ <Filter>Source Files\Feature</Filter> </ClCompile> <ClCompile Include="CastleManager.cpp"> +<<<<<<< HEAD <Filter>Source Files\Feature</Filter> </ClCompile> <ClCompile Include="OneVsOne.cpp"> +======= +>>>>>>> 48592baf82f27cd569305eca95a5e4b798b82cc7 <Filter>Source Files\Feature</Filter> </ClCompile> <ClCompile Include="Config.cpp"> |