From: Jaeho Lee <jaeho81.lee@samsung.com>
Date: Fri, 22 Mar 2013 07:10:05 +0000 (+0900)
Subject: Merge branch 'master' into tizen_2.1
X-Git-Tag: 2.1b_release~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46d060cdeaeefcd4d3c99595b8ca4c3fe0c3af79;p=framework%2Fappfw%2Fapp-svc.git

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>
---

46d060cdeaeefcd4d3c99595b8ca4c3fe0c3af79