projects / platform / upstream / murphy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06d0ba2 7a283db)
Merge branch 'tizen' into tizen_3.0 47/106047/1 accepted/tizen_3.0.m2_mobile accepted/tizen_3.0.m2_tv accepted/tizen_3.0.m2_wearable tizen_3.0.m2 accepted/tizen/3.0.m2/mobile/20170105.024811 accepted/tizen/3.0.m2/tv/20170105.024942 accepted/tizen/3.0.m2/wearable/20170105.025105 accepted/tizen/3.0/common/20161221.181309 accepted/tizen/3.0/ivi/20161221.010957 accepted/tizen/3.0/mobile/20161221.011621 accepted/tizen/3.0/tv/20161221.010749 accepted/tizen/3.0/wearable/20161221.011134 submit/tizen_3.0.m2/20170104.093753 submit/tizen_3.0/20161220.100802
authorJeongmo Yang <jm80.yang@samsung.com>
Tue, 20 Dec 2016 08:32:15 +0000 (17:32 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Tue, 20 Dec 2016 08:48:17 +0000 (17:48 +0900)
Conflicts:
packaging/murphy.spec
src/common/glib-glue.c

Change-Id: I6b37d638f2dcf16593a8ab86ae48fdcd6b8e742a
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

Trivial merge
Domain: Multimedia / Media Common;