Ignore:
Timestamp:
Dec 28, 2016 3:28:05 AM (7 years ago)
Author:
nanang
Message:

Re #1900: Merged from trunk (without 3 text conflicts in sln & vcxproj).

Location:
pjproject/branches/projects/uwp/third_party
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/uwp/third_party

    • Property svn:externals deleted
  • pjproject/branches/projects/uwp/third_party/build/srtp/libsrtp.vcxproj.filters

    r5181 r5512  
    1313      <UniqueIdentifier>{f75b0fc0-2c2f-43cd-b6c9-116b32197c2b}</UniqueIdentifier> 
    1414    </Filter> 
    15     <Filter Include="crypto\ae_xfm"> 
    16       <UniqueIdentifier>{54f5bab4-bfa9-4c72-b859-693816b56e7f}</UniqueIdentifier> 
    17     </Filter> 
    1815    <Filter Include="crypto\cipher"> 
    1916      <UniqueIdentifier>{32730aa3-8eba-44b6-9040-cc5f7d7e9656}</UniqueIdentifier> 
     
    4542      <Filter>Source Files</Filter> 
    4643    </ClCompile> 
    47     <ClCompile Include="..\..\srtp\crypto\ae_xfm\xfm.c"> 
    48       <Filter>crypto\ae_xfm</Filter> 
    49     </ClCompile> 
    5044    <ClCompile Include="..\..\srtp\crypto\cipher\aes.c"> 
    5145      <Filter>crypto\cipher</Filter> 
     
    106100    </ClCompile> 
    107101    <ClCompile Include="..\..\srtp\crypto\rng\rand_source.c"> 
     102      <Filter>crypto\rng</Filter> 
     103    </ClCompile> 
     104    <ClCompile Include="..\..\srtp\srtp\ekt.c"> 
     105      <Filter>Source Files</Filter> 
     106    </ClCompile> 
     107    <ClCompile Include="..\..\srtp\crypto\cipher\aes_icm_ossl.c"> 
     108      <Filter>crypto\cipher</Filter> 
     109    </ClCompile> 
     110    <ClCompile Include="..\..\srtp\crypto\cipher\aes_gcm_ossl.c"> 
     111      <Filter>crypto\cipher</Filter> 
     112    </ClCompile> 
     113    <ClCompile Include="..\..\srtp\crypto\hash\hmac_ossl.c"> 
     114      <Filter>crypto\hash</Filter> 
     115    </ClCompile> 
     116    <ClCompile Include="..\..\srtp\crypto\rng\rand_source_ossl.c"> 
    108117      <Filter>crypto\rng</Filter> 
    109118    </ClCompile> 
     
    200209      <Filter>crypto\include</Filter> 
    201210    </ClInclude> 
    202     <ClInclude Include="..\..\srtp\crypto\include\xfm.h"> 
    203       <Filter>crypto\include</Filter> 
     211    <ClInclude Include="..\..\srtp\include\ekt.h"> 
     212      <Filter>Header Files</Filter> 
    204213    </ClInclude> 
    205214  </ItemGroup> 
Note: See TracChangeset for help on using the changeset viewer.