source: SHVCSoftware/trunk/source @ 852

Name	Size	Rev	Age	Author	Last change
../
App		815	10 years	seregin	merge with SHM-6-dev branch
Lib		815	10 years	seregin	merge with SHM-6-dev branch

Property svn:mergeinfo set to /branches/SHM-1.0-dev/source merged eligible /branches/SHM-1.1-dev/source merged eligible /branches/SHM-2.0-dev/source merged eligible /branches/SHM-2.0avc-dev/source merged eligible /branches/SHM-2.1-dev/source merged eligible /branches/SHM-2.1-multilayers-dev/source merged eligible /branches/SHM-3.0-dev/source merged eligible /branches/SHM-3.1-dev/source merged eligible /branches/SHM-4.0-dev/source merged eligible /branches/SHM-4.1-dev/source merged eligible /branches/SHM-5.0-dev/source merged eligible /branches/SHM-5.1-dev/source merged eligible /branches/SHM-6-dev/source merged eligible