projects / platform / core / api / mediademuxer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82c9bf7 dbd653b)
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)
Change license file name

Change-Id: I19723aa65cd27bc1793bc4475b3dafdba9102e85

1  2 
LICENSE.Apache-2.0 patch | diff1 | diff2 | blob | history
packaging/capi-mediademuxer.spec patch | diff1 | diff2 | blob | history

diff --cc LICENSE.Apache-2.0
Simple merge
diff --cc packaging/capi-mediademuxer.spec
index 5b420d8,b39adf5..1bafe37
--- 1/packaging/capi-mediademuxer.spec
--- 2/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
Domain: Multimedia / Media Playback;