Changeset 12 in 3DVCSoftware for branches/0.2-poznan-univ/build/HM_vc8.sln


Ignore:
Timestamp:
6 Feb 2012, 00:52:17 (13 years ago)
Author:
poznan-univ
Message:

Poznan Tools

  • Depth base motion vector prediction
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/0.2-poznan-univ/build/HM_vc8.sln

    r11 r12  
    99                {5280C25A-D316-4BE7-AE50-29D72108624F} = {5280C25A-D316-4BE7-AE50-29D72108624F}
    1010                {8783AD3A-A5CA-42B7-AAC4-A07EB845A684} = {8783AD3A-A5CA-42B7-AAC4-A07EB845A684}
     11<<<<<<< .mine
     12                {5E87AD84-AC4F-4336-B4EE-549CA210EE4A} = {5E87AD84-AC4F-4336-B4EE-549CA210EE4A}
     13                {78018D78-F890-47E3-A0B7-09D273F0B11D} = {78018D78-F890-47E3-A0B7-09D273F0B11D}
     14                {F8B77A48-AF6C-4746-A89F-B706ABA6AD94} = {F8B77A48-AF6C-4746-A89F-B706ABA6AD94}
     15                {5280C25A-D316-4BE7-AE50-29D72108624F} = {5280C25A-D316-4BE7-AE50-29D72108624F}
     16=======
     17>>>>>>> .r11
    1118        EndProjectSection
    1219EndProject
Note: See TracChangeset for help on using the changeset viewer.