Ignore:
Timestamp:
26 Feb 2015, 00:21:54 (10 years ago)
Author:
seregin
Message:

merge with SHM-upgrade branch

Location:
branches/SHM-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-dev

  • branches/SHM-dev/build/vc10/TLibCommon_vc10.vcxproj

    r713 r1029  
    147147    <ClCompile Include="..\..\source\Lib\TLibCommon\ContextModel3DBuffer.cpp" />
    148148    <ClCompile Include="..\..\source\Lib\libmd5\libmd5.c" />
     149    <ClCompile Include="..\..\source\Lib\TLibCommon\Debug.cpp" />
    149150    <ClCompile Include="..\..\source\Lib\TLibCommon\SEI.cpp" />
    150151    <ClCompile Include="..\..\source\Lib\TLibCommon\TCom3DAsymLUT.cpp" />
    151152    <ClCompile Include="..\..\source\Lib\TLibCommon\TComBitStream.cpp" />
    152153    <ClCompile Include="..\..\source\Lib\TLibCommon\TComCABACTables.cpp" />
     154    <ClCompile Include="..\..\source\Lib\TLibCommon\TComChromaFormat.cpp" />
    153155    <ClCompile Include="..\..\source\Lib\TLibCommon\TComDataCU.cpp" />
    154156    <ClCompile Include="..\..\source\Lib\TLibCommon\TComInterpolationFilter.cpp" />
     
    167169    <ClCompile Include="..\..\source\Lib\TLibCommon\TComSlice.cpp" />
    168170    <ClCompile Include="..\..\source\Lib\TLibCommon\TComTrQuant.cpp" />
     171    <ClCompile Include="..\..\source\Lib\TLibCommon\TComTU.cpp" />
    169172    <ClCompile Include="..\..\source\Lib\TLibCommon\TComUpsampleFilter.cpp" />
    170173    <ClCompile Include="..\..\source\Lib\TLibCommon\TComWeightPrediction.cpp" />
     
    179182    <ClInclude Include="..\..\source\Lib\libmd5\libmd5.h" />
    180183    <ClInclude Include="..\..\source\Lib\libmd5\MD5.h" />
     184    <ClInclude Include="..\..\source\Lib\TLibCommon\Debug.h" />
    181185    <ClInclude Include="..\..\source\Lib\TLibCommon\NAL.h" />
    182186    <ClInclude Include="..\..\source\Lib\TLibCommon\SEI.h" />
     
    185189    <ClInclude Include="..\..\source\Lib\TLibCommon\TComBitStream.h" />
    186190    <ClInclude Include="..\..\source\Lib\TLibCommon\TComCABACTables.h" />
     191    <ClInclude Include="..\..\source\Lib\TLibCommon\TComChromaFormat.h" />
     192    <ClInclude Include="..\..\source\Lib\TLibCommon\TComCodingStatistics.h" />
    187193    <ClInclude Include="..\..\source\Lib\TLibCommon\TComDataCU.h" />
    188194    <ClInclude Include="..\..\source\Lib\TLibCommon\TComInterpolationFilter.h" />
     
    198204    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRdCost.h" />
    199205    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRdCostWeightPrediction.h" />
     206    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRectangle.h" />
    200207    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRom.h" />
    201208    <ClInclude Include="..\..\source\Lib\TLibCommon\TComSampleAdaptiveOffset.h" />
    202209    <ClInclude Include="..\..\source\Lib\TLibCommon\TComSlice.h" />
    203210    <ClInclude Include="..\..\source\Lib\TLibCommon\TComTrQuant.h" />
     211    <ClInclude Include="..\..\source\Lib\TLibCommon\TComTU.h" />
    204212    <ClInclude Include="..\..\source\Lib\TLibCommon\TComUpsampleFilter.h" />
    205213    <ClInclude Include="..\..\source\Lib\TLibCommon\TComWeightPrediction.h" />
Note: See TracChangeset for help on using the changeset viewer.