From: Gilbok Lee <gilbok.lee@samsung.com>
Date: Mon, 3 Apr 2017 06:24:00 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/unified/20170420.155214^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fc6aa88af42f69dcc13384d9b3a9694b83aa6c1;p=platform%2Fcore%2Fapi%2Fmediademuxer.git

Merge branch 'tizen_3.0' into tizen

Change license file name

Change-Id: I19723aa65cd27bc1793bc4475b3dafdba9102e85
---

5fc6aa88af42f69dcc13384d9b3a9694b83aa6c1
diff --cc packaging/capi-mediademuxer.spec
index 5b420d8,b39adf5..1bafe37
--- a/packaging/capi-mediademuxer.spec
+++ b/packaging/capi-mediademuxer.spec
@@@ -65,7 -67,7 +65,7 @@@ cp test/mediademuxer_test %{buildroot}%
  %files
  %manifest capi-mediademuxer.manifest
  %{_libdir}/libcapi-mediademuxer.so.*
- %license LICENSE.APLv2
 -%{_datadir}/license/%{name}
++%license LICENSE.Apache-2.0
  %{_bindir}/*
  
  %files devel