projects / platform / core / api / app-control.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5b3cdf 51be81f)
Merge branch 'tizen_2.2' into tizen
authorKyungwooNoh <kw1004.noh@samsung.com>
Wed, 2 Oct 2013 02:17:49 +0000 (11:17 +0900)
committerKyungwooNoh <kw1004.noh@samsung.com>
Wed, 2 Oct 2013 02:18:08 +0000 (11:18 +0900)
Conflicts:
packaging/capi-appfw-application.spec

Change-Id: I408f808cc3951d23f6888f0dc858595f9fa8e568
Signed-off-by: KyungwooNoh <kw1004.noh@samsung.com>
1  2 
packaging/capi-appfw-application.spec patch | diff1 | diff2 | blob | history

diff --cc packaging/capi-appfw-application.spec
Simple merge
Domain: App Framework / Application Core; Licenses: Apache-2.0;