merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:04:54 +0000 (01:04 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:04:54 +0000 (01:04 +0900)
commit1c67bdca0c2f2c8d0f80e0940579c6ad394d009b
tree0d916078976e12fbf710fd3fa09f16632e437d07
parent62d214f6031c50109217a6162e09be3bcc1656cf
merge with master
CMakeLists.txt
debian/changelog
lock-setting/lockscreen-options/src/lockscreen-options-main.c
packaging/starter.spec
src/pkg_event.c
src/starter.c
starter.manifest