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)
commitfbcdc2791644e370679097bac88da22cb375beef
treea98357b31cb1404ee51e5107c553d5635bda87be
parent5361bf5dfdbd74d0ebd35d83251f8fd81d6440a7
parent47b76815ba51b77284e2c75d75ccffa27ca84a12
Merge branch 'master' into tizen_2.1

Conflicts:
packaging/alarm-manager.spec

added new API

Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
alarm-manager.c
packaging/alarm-manager.spec