mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
Fixed merge error.
This commit is contained in:
parent
bec88f184d
commit
42795a5539
1 changed files with 2 additions and 0 deletions
|
|
@ -433,6 +433,7 @@
|
||||||
<ClCompile Include="..\..\src\shared\Auth\AuthCrypt.cpp" />
|
<ClCompile Include="..\..\src\shared\Auth\AuthCrypt.cpp" />
|
||||||
<ClCompile Include="..\..\src\shared\Auth\BigNumber.cpp" />
|
<ClCompile Include="..\..\src\shared\Auth\BigNumber.cpp" />
|
||||||
<ClCompile Include="..\..\src\shared\Auth\Hmac.cpp" />
|
<ClCompile Include="..\..\src\shared\Auth\Hmac.cpp" />
|
||||||
|
<ClCompile Include="..\..\src\shared\Auth\SARC4.cpp" />
|
||||||
<ClCompile Include="..\..\src\shared\Auth\Sha1.cpp" />
|
<ClCompile Include="..\..\src\shared\Auth\Sha1.cpp" />
|
||||||
<ClCompile Include="..\..\src\shared\Base.cpp" />
|
<ClCompile Include="..\..\src\shared\Base.cpp" />
|
||||||
<ClCompile Include="..\..\src\shared\Common.cpp" />
|
<ClCompile Include="..\..\src\shared\Common.cpp" />
|
||||||
|
|
@ -469,6 +470,7 @@
|
||||||
<ClInclude Include="..\..\src\shared\Auth\AuthCrypt.h" />
|
<ClInclude Include="..\..\src\shared\Auth\AuthCrypt.h" />
|
||||||
<ClInclude Include="..\..\src\shared\Auth\BigNumber.h" />
|
<ClInclude Include="..\..\src\shared\Auth\BigNumber.h" />
|
||||||
<ClInclude Include="..\..\src\shared\Auth\Hmac.h" />
|
<ClInclude Include="..\..\src\shared\Auth\Hmac.h" />
|
||||||
|
<ClInclude Include="..\..\src\shared\Auth\SARC4.h" />
|
||||||
<ClInclude Include="..\..\src\shared\Auth\Sha1.h" />
|
<ClInclude Include="..\..\src\shared\Auth\Sha1.h" />
|
||||||
<ClInclude Include="..\..\src\shared\Base.h" />
|
<ClInclude Include="..\..\src\shared\Base.h" />
|
||||||
<ClInclude Include="..\..\src\shared\ByteBuffer.h" />
|
<ClInclude Include="..\..\src\shared\ByteBuffer.h" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue