Merge branch 'master' into tizen_2.1
authorJaeho Lee <jaeho81.lee@samsung.com>
Fri, 22 Mar 2013 07:10:05 +0000 (16:10 +0900)
committerJaeho Lee <jaeho81.lee@samsung.com>
Fri, 22 Mar 2013 07:10:05 +0000 (16:10 +0900)
commit46d060cdeaeefcd4d3c99595b8ca4c3fe0c3af79
treea9c95484a1a4feba7547c8a2ddeefc8abcc725cf
parent70ed9ed4ed8e4858d3a9b8e9ca8ebf0cb366b5c1
parentc4d8ce3ae2deee6b964ff8d348fb2f3c9d03ea2c
Merge branch 'master' into tizen_2.1

1. added operations
2. added app-selector define

Conflicts:
include/appsvc.h
packaging/app-svc.spec
src/appsvc.c

Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>