projects / platform / core / api / context.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit3626133f7874b79c8450d9b41afcc9fbdca6eb78
tree03a84ae95e422d1d8946f9e22084701acf198284tree | snapshot
parent593ae990bb1691e05866232072d3ec35ba111964commit | diff
parent250d3ced43dc45171cb9c380072e92878ab72170commit | diff
Merge branch 'devel/tizen' into tizen

* 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
Domain: Service Framework / Context;