projects
/
framework
/
appfw
/
alarm-manager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
58ab929
6113f19
)
Merge branch 'master' into tizen_2.1
author
Jaeho Lee
<jaeho81.lee@samsung.com>
Wed, 20 Mar 2013 07:57:52 +0000
(16:57 +0900)
committer
Jaeho Lee
<jaeho81.lee@samsung.com>
Wed, 20 Mar 2013 07:57:52 +0000
(16:57 +0900)
added a type
Conflicts:
alarm-server.manifest
packaging/alarm-manager.spec
Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
Trivial merge
projects / framework / appfw / alarm-manager.git / commitdiff