diff options
| author | Jaeho Lee <jaeho81.lee@samsung.com> | 2013-03-29 11:14:51 +0900 |
|---|---|---|
| committer | Jaeho Lee <jaeho81.lee@samsung.com> | 2013-03-29 11:14:51 +0900 |
| commit | c3c38058a53994488f8f5f961643d33bc64d5d17 (patch) | |
| tree | 2540a52cae559be3315c8374fb3c869164c4a72a /packaging | |
| parent | ec5a330539509ee5360809699e0e758046f8d55f (diff) | |
| parent | a671a0b0daba404ebf880858c802fa68e2a8fa52 (diff) | |
| download | alarm-manager-c3c38058a53994488f8f5f961643d33bc64d5d17.tar.gz alarm-manager-c3c38058a53994488f8f5f961643d33bc64d5d17.tar.bz2 alarm-manager-c3c38058a53994488f8f5f961643d33bc64d5d17.zip | |
Merge branch 'master' into tizen_2.1
added a type
Conflicts:
packaging/alarm-manager.spec
Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
Diffstat (limited to 'packaging')
0 files changed, 0 insertions, 0 deletions