Merge branch 'master' into tizen_2.1
authorJaeho Lee <jaeho81.lee@samsung.com>
Sat, 6 Apr 2013 05:46:11 +0000 (14:46 +0900)
committerJaeho Lee <jaeho81.lee@samsung.com>
Sat, 6 Apr 2013 05:46:11 +0000 (14:46 +0900)
commitb19163968c9a97cd30cb2048c0ecb7ac8c728257
tree1fca1c2f67da3862c1f810a090f00fefa4476ffc
parentafe0c68315b6f78a980c2ad82a234101f5882b32
parentdebc9606587b270695f2867af5d5c842b350af05
Merge branch 'master' into tizen_2.1

added new API

Conflicts:
packaging/app-core.spec

Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
packaging/app-core.spec
src/appcore-efl.c