projects / platform / core / system / resourced-headless.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80bf0c8 560d5e2)
Merge remote-tracking branch 'tizen.org/tizen_4.0' into tizen 50/188050/1 accepted/tizen/unified/20180831.165146 submit/tizen/20180830.155552 submit/tizen/20180830.162301
authorŁukasz Stelmach <l.stelmach@samsung.com>
Thu, 30 Aug 2018 15:03:51 +0000 (17:03 +0200)
committerŁukasz Stelmach <l.stelmach@samsung.com>
Thu, 30 Aug 2018 15:03:51 +0000 (17:03 +0200)
Conflicts:
packaging/resourced-headless.spec

Change-Id: I69ba982062858a4a7c5ba83f0cb9114b0179c103

1  2 
packaging/resourced-headless.spec patch | diff1 | diff2 | blob | history

diff --cc packaging/resourced-headless.spec
index 3014d204c5c8ba0354a164993712748cb1a1413f,982acd6dbe97a019e0744ce64f1cbdea80b6e5a6..993448bcb20cce63201f0776c77455688ea60729
--- 1/packaging/resourced-headless.spec
--- 2/packaging/resourced-headless.spec
+++ b/packaging/resourced-headless.spec
@@@ -1,6 -1,6 +1,7 @@@
  Name:       resourced-headless
  Summary:    Resource management daemon for headless device
- Version:    0.2
 -Version:    0.1.2
++
++Version:    0.2.2
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0
Domain: System / System Framework;