Merge branch 'tizen_3.0' into tizen 59/122659/2 accepted/tizen/unified/20170420.155214 submit/tizen/20170420.053325 tizen_4.0.m1_release
authorGilbok Lee <gilbok.lee@samsung.com>
Mon, 3 Apr 2017 06:24:00 +0000 (15:24 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Mon, 3 Apr 2017 08:08:29 +0000 (17:08 +0900)
commit5fc6aa88af42f69dcc13384d9b3a9694b83aa6c1
treec96c261c7dfdcf12049ff06ee335a19a2d894593
parent82c9bf7ffd47ba3747f927f7c247283407526953
parentdbd653b6aaeee277ed3c6ffd6f940413c49a2489
Merge branch 'tizen_3.0' into tizen

Change license file name

Change-Id: I19723aa65cd27bc1793bc4475b3dafdba9102e85
LICENSE.Apache-2.0
packaging/capi-mediademuxer.spec