projects / platform / core / api / motion.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cd00af 3568568)
Merge branch 'devel/tizen' into tizen 15/117715/1 accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable accepted/tizen/common/20170307.133939 accepted/tizen/ivi/20170307.102422 accepted/tizen/mobile/20170307.102330 accepted/tizen/tv/20170307.102350 accepted/tizen/unified/20170309.031453 accepted/tizen/wearable/20170307.102406 submit/tizen/20170307.063651 submit/tizen_common/20170307.144550 submit/tizen_unified/20170308.100404
authorMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 7 Mar 2017 07:36:56 +0000 (16:36 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 7 Mar 2017 07:36:56 +0000 (16:36 +0900)
* devel/tizen:
  Disable the conflicting virtual package

Change-Id: I7adc5f75baf35947b3264ee1a14651491af5b004
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

Trivial merge
Domain: Service Framework / Context;