projects / platform / core / api / context.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 593ae99 250d3ce)
Merge branch 'devel/tizen' into tizen 10/117710/1
authorMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 7 Mar 2017 07:24:58 +0000 (16:24 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 7 Mar 2017 07:24:58 +0000 (16:24 +0900)
* devel/tizen:
  Add a dummy package context to avoid obs image creation failure
  Add a dummy package context-devel to avoid obs unresolvable issues

Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
Conflicts:
packaging/capi-context.spec

Change-Id: I6fd1f0a22e50959c0e1145f3f300816206db119c


Trivial merge
Domain: Service Framework / Context;