projects
/
platform
/
core
/
appfw
/
alarm-manager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ec5a330
a671a0b
)
Merge branch 'master' into tizen_2.1
author
Jaeho Lee
<jaeho81.lee@samsung.com>
Fri, 29 Mar 2013 02:14:51 +0000
(11:14 +0900)
committer
Jaeho Lee
<jaeho81.lee@samsung.com>
Fri, 29 Mar 2013 02:14:51 +0000
(11:14 +0900)
added a type
Conflicts:
packaging/alarm-manager.spec
Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
Trivial merge
projects / platform / core / appfw / alarm-manager.git / commitdiff