diff options
| author | Sung-jae Park <nicesj.park@samsung.com> | 2013-03-21 13:10:55 +0000 |
|---|---|---|
| committer | Sung-jae Park <nicesj.park@samsung.com> | 2013-03-21 13:10:55 +0000 |
| commit | 2a87b7aaa171fec06c32f95bef862056160ea311 (patch) | |
| tree | c794bc7c5e1a78d637d12f8a7c08af6ba0586865 /pkgmgr_shortcut | |
| parent | 11a58e2aed32893adf9d71c16914bcdbbe7836b4 (diff) | |
| parent | ad011742b5686f792cff4def7884cdd0a622cc5c (diff) | |
| download | shortcut-2a87b7aaa171fec06c32f95bef862056160ea311.tar.gz shortcut-2a87b7aaa171fec06c32f95bef862056160ea311.tar.bz2 shortcut-2a87b7aaa171fec06c32f95bef862056160ea311.zip | |
Merge branch 'master' into tizen_2.1
Conflicts:
lib/include/shortcut.h
lib/src/main.c
packaging/libshortcut.spec
Change-Id: Iea906d9a45831adb87457e30198efef41c72f2ee
Diffstat (limited to 'pkgmgr_shortcut')
0 files changed, 0 insertions, 0 deletions