diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2016-12-20 17:32:15 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2016-12-20 17:48:17 +0900 |
| commit | 3ee3c6b4059e715cfede2418a0619dd97d60d91f (patch) | |
| tree | 4fd1d78e963447ea6ee1a0614f275caf50aea1c4 /LICENSE-BSD | |
| parent | 06d0ba2d2501fac59f2d1b96782412afd1194b81 (diff) | |
| parent | 7a283dbb2ef34dc24492029f39ba182c3fee1326 (diff) | |
| download | murphy-accepted/tizen/3.0.m2/tv/20170105.024942.tar.gz murphy-accepted/tizen/3.0.m2/tv/20170105.024942.tar.bz2 murphy-accepted/tizen/3.0.m2/tv/20170105.024942.zip | |
Merge branch 'tizen' into tizen_3.0submit/tizen_3.0/20161220.100802submit/tizen_3.0.m2/20170104.093753accepted/tizen/3.0/wearable/20161221.011134accepted/tizen/3.0/tv/20161221.010749accepted/tizen/3.0/mobile/20161221.011621accepted/tizen/3.0/ivi/20161221.010957accepted/tizen/3.0/common/20161221.181309accepted/tizen/3.0.m2/wearable/20170105.025105accepted/tizen/3.0.m2/tv/20170105.024942accepted/tizen/3.0.m2/mobile/20170105.024811tizen_3.0.m2accepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile
Conflicts:
packaging/murphy.spec
src/common/glib-glue.c
Change-Id: I6b37d638f2dcf16593a8ab86ae48fdcd6b8e742a
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
Diffstat (limited to 'LICENSE-BSD')
0 files changed, 0 insertions, 0 deletions