projects / framework / appfw / alarm-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5361bf5 47b7681)
Merge branch 'master' into tizen_2.1 tizen_2.1 submit/tizen_2.1/20130514.050845
authorJaeho Lee <jaeho81.lee@samsung.com>
Mon, 6 May 2013 07:09:27 +0000 (16:09 +0900)
committerJaeho Lee <jaeho81.lee@samsung.com>
Mon, 6 May 2013 07:09:27 +0000 (16:09 +0900)
Conflicts:
packaging/alarm-manager.spec

added new API

Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
1  2 
alarm-manager.c patch | diff1 | diff2 | blob | history
packaging/alarm-manager.spec patch | diff1 | diff2 | blob | history

diff --cc alarm-manager.c
Simple merge
diff --cc packaging/alarm-manager.spec
index d62a29b,60bbd04..7ee7d8c
mode 100755,100644..100755
--- 1/packaging/alarm-manager.spec
--- 2/packaging/alarm-manager.spec
+++ b/packaging/alarm-manager.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       alarm-manager
  Summary:    Alarm library
- Version:    0.4.69
 -Version:    0.4.66
++Version:    0.4.70
  Release:    1
  Group:      System/Libraries
  License:    Apache License, Version 2.0
Domain: App Framework / Uncategorized;