Fixed merge error.

This commit is contained in:
tomrus88 2009-05-26 17:08:25 +04:00
parent bec88f184d
commit 42795a5539

View file

@ -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" />